From 7d2fe54fb20df1b1235e722870437dbeb42f3ff6 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854> Date: Tue, 31 Jan 2023 18:00:26 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=8F=91=E9=80=81=E5=88=B0=E4=BB=93?= =?UTF-8?q?=E5=BA=93=201.31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/productplan/ProductplanManage.vue | 16 +++++- .../controller/ZyPlanProcessController.java | 8 +++ .../service/IZyPlanProcessService.java | 2 + .../impl/ZyPlanProcessServiceImpl.java | 55 +++++++++++++++++++ 4 files changed, 78 insertions(+), 3 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/productplan/ProductplanManage.vue b/ant-design-vue-jeecg/src/views/productplan/ProductplanManage.vue index da687141..25ae73e0 100644 --- a/ant-design-vue-jeecg/src/views/productplan/ProductplanManage.vue +++ b/ant-design-vue-jeecg/src/views/productplan/ProductplanManage.vue @@ -53,7 +53,7 @@ 查看物料单 - 发送到仓库 + 发送到仓库 导出 返回 @@ -205,6 +205,7 @@ export default { syncProductProcess: "/org.jeecg.modules.productplan/zyPlanProcess/syncProductProcess", autoFilling: "/org.jeecg.modules.productplan/zyPlanProcess/autoFilling", createMaterialBill: "/org.jeecg.modules.productplan/zyPlanProcess/createMaterialBill", + sendToRepository: "/org.jeecg.modules.productplan/zyPlanProcess/sendToRepository", stationToolslist: "/stationTool/list2", stationMachinelist: "/stationMachine/list2", addProcessBatch: "/org.jeecg.modules.productplan/zyPlanProcess/addProcessBatch", @@ -364,7 +365,17 @@ export default { //发送到仓库 sendToRepository(){ - + this.loading = true; + getAction(this.url.sendToRepository, {"planId": this.planId}).then((res) => { + if (res.success) { + this.$message.success("操作成功"); + this.loadData(); + } else { + this.$message.warning(res.message) + } + }).finally(() => { + this.loading = false + }) }, //加载传递参数 @@ -372,7 +383,6 @@ export default { // debugger; if (this.loadRouteType === false) { this.planId = this.$route.query.planId; - // this.biaoTi = this.$route.query.styleNames+"款式面料管理"; console.log("*******传递的planId:" + this.planId) this.loadRouteType = true; } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java index 05f66f4e..2c11750f 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java @@ -146,6 +146,14 @@ public class ZyPlanProcessController extends JeecgController sendToRepository(ZyPlanProcess zyPlanProcess, + HttpServletRequest req) { + zyPlanProcessService.sendToRepository(zyPlanProcess); + return Result.OK(); + } + @ApiOperation(value = "计划班组管理-查询产品工序&班组", notes = "计划班组管理-查询产品工序&班组") @GetMapping(value = "/getTeamDatalist") public Result getTeamDatalist(ZyPlanProcess zyPlanProcess, diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java index aaf98675..4cc0099a 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java @@ -28,4 +28,6 @@ public interface IZyPlanProcessService extends IService { void createMaterialBill(ZyPlanProcess zyPlanProcess); Map getWuLiaoDetail(ZyPlanProcess zyPlanProcess); + + void sendToRepository(ZyPlanProcess zyPlanProcess); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java index 90aa62d7..63b0afe0 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java @@ -11,6 +11,8 @@ import org.jeecg.modules.demo.accessories.entity.ZyAccessories; import org.jeecg.modules.demo.accessories.service.IZyAccessoriesService; import org.jeecg.modules.demo.base.entity.ZyProcess; import org.jeecg.modules.demo.base.service.IZyProcessService; +import org.jeecg.modules.demo.delivery.entity.Delivery; +import org.jeecg.modules.demo.delivery.service.IDeliveryService; import org.jeecg.modules.demo.fabric.entity.ZyFabric; import org.jeecg.modules.demo.fabric.service.IZyFabricService; import org.jeecg.modules.demo.ordergoods.entity.OrderGoods; @@ -146,6 +148,9 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl getProcessDatalist(ZyPlanProcess zyPlanProcess) { //生产计划id String planId = zyPlanProcess.getPlanId(); @@ -508,6 +513,56 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper() + .eq(ZyPlanFabric::getPlanId, zyPlanProcess.getPlanId())); + List deliveryList4Fabric = new LinkedList<>(); + Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> { + Delivery delivery = new Delivery(); + delivery.setDeliveryReason("0"); + delivery.setDeliveryTime(new Date()); + delivery.setItemType("0"); + delivery.setAmount(e.getAmount().doubleValue()); + delivery.setCarrierId("admin"); + delivery.setAdminId("admin"); + delivery.setStorehouseId("TODO"); + ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId()); + if (!ObjectUtils.isEmpty(zyFabric)) { + delivery.setItemCode(zyFabric.getFabricNumber()); + } + deliveryList4Fabric.add(delivery); + }); + iDeliveryService.saveBatch(deliveryList4Fabric); + + List accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper() + .eq(ZyPlanAccessories::getPlanId, zyPlanProcess.getPlanId())); + List deliveryList4accessories = new LinkedList<>(); + Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> { + Delivery delivery2 = new Delivery(); + delivery2.setDeliveryReason("0"); + delivery2.setDeliveryTime(new Date()); + delivery2.setItemType("1"); + delivery2.setAmount(e.getAmount().doubleValue()); + delivery2.setCarrierId("admin"); + delivery2.setAdminId("admin"); + delivery2.setStorehouseId("TODO"); + ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId()); + if (!ObjectUtils.isEmpty(zyAccessories)) { + delivery2.setItemCode(zyAccessories.getNums()); + } + deliveryList4accessories.add(delivery2); + }); + iDeliveryService.saveBatch(deliveryList4accessories); + } + + @Override public Map getWuLiaoDetail(ZyPlanProcess zyPlanProcess) { String planId = zyPlanProcess.getPlanId(); From df668f2f894d404d58ba1e23a4f1e3e85cadef90 Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Wed, 1 Feb 2023 09:23:51 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/CustomerPaymentList.vue | 3 +- .../admin/modules/CustomerPaymentList1.vue | 2 + .../admin/CustomerReceivingAddressList.vue | 13 +++- .../modules/CustomerReceivingAddressForm.vue | 5 +- .../CustomerReceivingAddressController.java | 61 +++++++++++++++++-- .../CustomerReceivingAddressMapper.java | 18 ++++++ .../ICustomerReceivingAddressService.java | 5 ++ .../CustomerReceivingAddressServiceImpl.java | 35 +++++++++++ 8 files changed, 128 insertions(+), 14 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/customerpayment/admin/CustomerPaymentList.vue b/ant-design-vue-jeecg/src/views/customerpayment/admin/CustomerPaymentList.vue index 87572524..f1199cec 100644 --- a/ant-design-vue-jeecg/src/views/customerpayment/admin/CustomerPaymentList.vue +++ b/ant-design-vue-jeecg/src/views/customerpayment/admin/CustomerPaymentList.vue @@ -203,8 +203,7 @@ } ], url: { - up: "/customerpayment/customerPayment/up", - down: "/customerpayment/customerPayment/down", + list: "/customerpayment/customerPayment/list", delete: "/customerpayment/customerPayment/delete", deleteBatch: "/customerpayment/customerPayment/deleteBatch", diff --git a/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue b/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue index 738d4944..a969c57a 100644 --- a/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue +++ b/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue @@ -194,6 +194,8 @@ } ], url: { + up: "/customerpayment/customerPayment/up", + down: "/customerpayment/customerPayment/down", list: "/customerpayment/customerPayment/list1", delete: "/customerpayment/customerPayment/delete", deleteBatch: "/customerpayment/customerPayment/deleteBatch", diff --git a/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/CustomerReceivingAddressList.vue b/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/CustomerReceivingAddressList.vue index 81a099c0..7d097d5f 100644 --- a/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/CustomerReceivingAddressList.vue +++ b/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/CustomerReceivingAddressList.vue @@ -98,6 +98,8 @@ + 排序 + 编辑 @@ -119,7 +121,7 @@ - + @@ -130,6 +132,7 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import CustomerReceivingAddressModal from './modules/CustomerReceivingAddressModal' + import CustomerReceivingAddressModal1 from './modules/CustomerReceivingAddressModal1' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' import Area from '@/components/_util/Area' @@ -137,7 +140,8 @@ name: 'CustomerReceivingAddressList', mixins:[JeecgListMixin, mixinDevice], components: { - CustomerReceivingAddressModal + CustomerReceivingAddressModal, + CustomerReceivingAddressModal1 }, data () { return { @@ -227,6 +231,11 @@ }, }, methods: { + paixu: function (record) { + this.$refs.modalFormpaixu.edit(record.userId); + this.$refs.modalFormpaixu.title = record.userId_dictText+"测体管理"; + this.$refs.modalFormpaixu.disableSubmit = false; + }, getPcaText(code){ return this.pcaData.getText(code); }, diff --git a/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressForm.vue b/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressForm.vue index e3fbe59b..370a9d1e 100644 --- a/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressForm.vue +++ b/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressForm.vue @@ -121,10 +121,7 @@ { required: false}, { validator: (rule, value, callback) => validateDuplicateValue('customer_receiving_address', 'sort', value, this.model.id, callback)}, ], - labelcl: [ - { required: false}, - { validator: (rule, value, callback) => validateDuplicateValue('customer_receiving_address', 'labelcl', value, this.model.id, callback)}, - ], + }, url: { add: "/customerreceivingaddress/customerReceivingAddress/add", diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/controller/CustomerReceivingAddressController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/controller/CustomerReceivingAddressController.java index 50a0198e..9baa9022 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/controller/CustomerReceivingAddressController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/controller/CustomerReceivingAddressController.java @@ -49,7 +49,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; public class CustomerReceivingAddressController extends JeecgController { @Autowired private ICustomerReceivingAddressService customerReceivingAddressService; - + /** * 分页列表查询 * @@ -71,7 +71,33 @@ public class CustomerReceivingAddressController extends JeecgController pageList = customerReceivingAddressService.page(page, queryWrapper); return Result.OK(pageList); } - + + + /** + * 分页列表查询 + * + * @param customerReceivingAddress + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "顾客地址表-分页列表查询") + @ApiOperation(value="顾客地址表-分页列表查询", notes="顾客地址表-分页列表查询") + @GetMapping(value = "/list1") + public Result queryPageList1(CustomerReceivingAddress customerReceivingAddress, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(customerReceivingAddress, req.getParameterMap()); + System.out.println(customerReceivingAddress.getUserId()); + queryWrapper.eq("user_id",customerReceivingAddress.getUserId()); + Page page = new Page(pageNo, pageSize); + IPage pageList = customerReceivingAddressService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** * 添加 * @@ -89,7 +115,7 @@ public class CustomerReceivingAddressController extends JeecgController shang(@RequestParam(name="id",required=true) String id) { + customerReceivingAddressService.up(id); + return Result.ok("升序成功"); + } + + + @AutoLog(value = "排序") + @ApiOperation(value="排序", notes="排序") + @GetMapping(value = "/down") + public Result xia(@RequestParam(name="id",required=true) String id) { + int a=customerReceivingAddressService.findSort(id); + if(a==0){ + return Result.error("当前已经是最低级别！！！");}else { + customerReceivingAddressService.down(id); + return Result.ok("降序成功"); + } + } + + } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/mapper/CustomerReceivingAddressMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/mapper/CustomerReceivingAddressMapper.java index 7445d1ab..27ef59ec 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/mapper/CustomerReceivingAddressMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/mapper/CustomerReceivingAddressMapper.java @@ -3,6 +3,8 @@ package org.jeecg.modules.demo.customerreceivingaddress.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import org.jeecg.modules.demo.customerreceivingaddress.entity.CustomerReceivingAddress; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +16,20 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface CustomerReceivingAddressMapper extends BaseMapper { + @Select("select sort from customer_receiving_address where id=#{id} ") + Integer upfindsort(String id); + + @Select("select id from customer_receiving_address where sort=#{i} ") + String findproid(int i); + + @Update("update customer_receiving_address set sort =#{i} where id = #{id} ") + void innew(String id, int i); + + @Update("update customer_receiving_address set sort =#{sort} where id = #{proid} ") + void innewpro(String proid, Integer sort); + + @Select("select sort from customer_receiving_address where id=#{id} ") + int findSort(String id); + + } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/service/ICustomerReceivingAddressService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/service/ICustomerReceivingAddressService.java index 1047e84a..c052b63b 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/service/ICustomerReceivingAddressService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/service/ICustomerReceivingAddressService.java @@ -11,4 +11,9 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ICustomerReceivingAddressService extends IService { + void up(String id); + + int findSort(String id); + + void down(String id); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/service/impl/CustomerReceivingAddressServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/service/impl/CustomerReceivingAddressServiceImpl.java index 4b7e966f..05d7ca61 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/service/impl/CustomerReceivingAddressServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/service/impl/CustomerReceivingAddressServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.customerreceivingaddress.service.impl; import org.jeecg.modules.demo.customerreceivingaddress.entity.CustomerReceivingAddress; import org.jeecg.modules.demo.customerreceivingaddress.mapper.CustomerReceivingAddressMapper; import org.jeecg.modules.demo.customerreceivingaddress.service.ICustomerReceivingAddressService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,4 +17,38 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class CustomerReceivingAddressServiceImpl extends ServiceImpl implements ICustomerReceivingAddressService { + + @Autowired + CustomerReceivingAddressMapper customerReceivingAddressMapper; + + @Override + public void up(String id) { + Integer sort = customerReceivingAddressMapper.upfindsort(id); + if (sort>0) { + //升序前找到后一个排序 + String proid = customerReceivingAddressMapper.findproid(sort + 1); + if (proid!="") { + //调换排序 + customerReceivingAddressMapper.innew(id,sort+1); + customerReceivingAddressMapper.innewpro(proid,sort); + } + } + } + + @Override + public int findSort(String id) { + return customerReceivingAddressMapper.findSort(id); + } + + @Override + public void down(String id) { + Integer sort = customerReceivingAddressMapper.upfindsort(id); + if (sort>0) { + String proid = customerReceivingAddressMapper.findproid(sort - 1); + if (proid!="") { + customerReceivingAddressMapper.innew(id,sort-1); + customerReceivingAddressMapper.innewpro(proid,sort); + } + } + } } From f0900655e13574d0a807dbdec20609f44eba85ba Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Wed, 1 Feb 2023 09:25:06 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/CustomerReceivingAddressList1.vue | 279 ++++++++++++++++++ .../CustomerReceivingAddressModal1.vue | 61 ++++ 2 files changed, 340 insertions(+) create mode 100644 ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressList1.vue create mode 100644 ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressModal1.vue diff --git a/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressList1.vue b/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressList1.vue new file mode 100644 index 00000000..8f08a4b3 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressList1.vue @@ -0,0 +1,279 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressModal1.vue b/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressModal1.vue new file mode 100644 index 00000000..baa2b214 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressModal1.vue @@ -0,0 +1,61 @@ + + + \ No newline at end of file From c3c1b94591dc1f9ed4d32daa72403b5d497eaa6f Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 1 Feb 2023 09:59:03 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=A8=A1=E5=9D=97=E4=BB=A5=E5=8F=8A=E5=95=86?= =?UTF-8?q?=E5=93=81=E7=AE=A1=E7=90=86BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/ordergoods/OrderGoodsList.vue | 57 ++++++++++++++++++- .../OrderGoodsAccessoriesList.vue | 45 ++------------- .../ordergoodsfabric/OrderGoodsFabricList.vue | 45 ++------------- .../ordergoodsmodule/OrderGoodsModuleList.vue | 49 ++-------------- .../src/views/zyorders/ZyOrdersList.vue | 27 ++++++--- .../controller/OrderGoodsController.java | 37 ++++++++++-- .../OrderGoodsAccessoriesController.java | 3 +- .../OrderGoodsFabricController.java | 3 +- .../OrderGoodsModuleController.java | 3 +- 9 files changed, 127 insertions(+), 142 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/ordergoods/OrderGoodsList.vue b/ant-design-vue-jeecg/src/views/ordergoods/OrderGoodsList.vue index 2677c4df..2dade959 100644 --- a/ant-design-vue-jeecg/src/views/ordergoods/OrderGoodsList.vue +++ b/ant-design-vue-jeecg/src/views/ordergoods/OrderGoodsList.vue @@ -112,7 +112,15 @@ 下载 - + + + 详情 @@ -279,6 +287,21 @@ align:"center", dataIndex: 'payTotalPrice' }, + { + title: '订单商品模块', + align: "center", + scopedSlots: {customRender: 'mk'} + }, + { + title: '订单商品面料', + align: "center", + scopedSlots: {customRender: 'ml'} + }, + { + title: '订单商品辅料', + align: "center", + scopedSlots: {customRender: 'fl'} + }, { title: '操作', dataIndex: 'action', @@ -289,7 +312,7 @@ } ], url: { - list: "/ordergoods/orderGoods/list", + list: "/ordergoods/orderGoods/list?orderid="+this.$route.query.orderid+"&ischild="+this.$route.query.ischild, delete: "/ordergoods/orderGoods/delete", deleteBatch: "/ordergoods/orderGoods/deleteBatch", exportXlsUrl: "/ordergoods/orderGoods/exportXls", @@ -309,6 +332,36 @@ }, }, methods: { + goodsModule(record) + { + this.$router.push({ + path: '/ordergoodsmodule/OrderGoodsModuleList', + query: { // 路由携带参数 + 'ordergoodsid': record.id, + 'goodsname':record.goodsName, + } + }); + }, + goodsModule2(record) + { + this.$router.push({ + path: '/ordergoodsfabric/OrderGoodsFabricList', + query: { // 路由携带参数 + 'ordergoodsid': record.id, + 'goodsname':record.goodsName, + } + }); + }, + goodsModule3(record) + { + this.$router.push({ + path: '/ordergoodsaccessories/OrderGoodsAccessoriesList', + query: { // 路由携带参数 + 'ordergoodsid': record.id, + 'goodsname':record.goodsName, + } + }); + }, initDictConfig(){ }, getSuperFieldList(){ diff --git a/ant-design-vue-jeecg/src/views/ordergoodsaccessories/OrderGoodsAccessoriesList.vue b/ant-design-vue-jeecg/src/views/ordergoodsaccessories/OrderGoodsAccessoriesList.vue index 90646e4a..632e2380 100644 --- a/ant-design-vue-jeecg/src/views/ordergoodsaccessories/OrderGoodsAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/ordergoodsaccessories/OrderGoodsAccessoriesList.vue @@ -1,34 +1,19 @@ - 编辑 - - - - 更多 - - - 详情 - - - - 删除 - - - - + 详情 @@ -174,12 +138,12 @@ } ], url: { - list: "/ordergoodsaccessories/orderGoodsAccessories/list", + list: "/ordergoodsaccessories/orderGoodsAccessories/list?ordergoodsid="+this.$route.query.ordergoodsid, delete: "/ordergoodsaccessories/orderGoodsAccessories/delete", deleteBatch: "/ordergoodsaccessories/orderGoodsAccessories/deleteBatch", exportXlsUrl: "/ordergoodsaccessories/orderGoodsAccessories/exportXls", importExcelUrl: "ordergoodsaccessories/orderGoodsAccessories/importExcel", - + }, dictOptions:{}, superFieldList:[], @@ -187,6 +151,7 @@ }, created() { this.getSuperFieldList(); + this.biaoTi = this.$route.query.goodsname+"订单商品辅料管理"; }, computed: { importExcelUrl: function(){ diff --git a/ant-design-vue-jeecg/src/views/ordergoodsfabric/OrderGoodsFabricList.vue b/ant-design-vue-jeecg/src/views/ordergoodsfabric/OrderGoodsFabricList.vue index 3defa2a9..4a8be7ea 100644 --- a/ant-design-vue-jeecg/src/views/ordergoodsfabric/OrderGoodsFabricList.vue +++ b/ant-design-vue-jeecg/src/views/ordergoodsfabric/OrderGoodsFabricList.vue @@ -1,34 +1,19 @@ - 编辑 - - - - 更多 - - - 详情 - - - - 删除 - - - - + 详情 @@ -174,12 +138,12 @@ } ], url: { - list: "/ordergoodsfabric/orderGoodsFabric/list", + list: "/ordergoodsfabric/orderGoodsFabric/list?ordergoodsid="+this.$route.query.ordergoodsid, delete: "/ordergoodsfabric/orderGoodsFabric/delete", deleteBatch: "/ordergoodsfabric/orderGoodsFabric/deleteBatch", exportXlsUrl: "/ordergoodsfabric/orderGoodsFabric/exportXls", importExcelUrl: "ordergoodsfabric/orderGoodsFabric/importExcel", - + }, dictOptions:{}, superFieldList:[], @@ -187,6 +151,7 @@ }, created() { this.getSuperFieldList(); + this.biaoTi = this.$route.query.goodsname+"订单商品面料管理"; }, computed: { importExcelUrl: function(){ diff --git a/ant-design-vue-jeecg/src/views/ordergoodsmodule/OrderGoodsModuleList.vue b/ant-design-vue-jeecg/src/views/ordergoodsmodule/OrderGoodsModuleList.vue index 082ef795..0c40654e 100644 --- a/ant-design-vue-jeecg/src/views/ordergoodsmodule/OrderGoodsModuleList.vue +++ b/ant-design-vue-jeecg/src/views/ordergoodsmodule/OrderGoodsModuleList.vue @@ -1,44 +1,24 @@ - 编辑 - - - - 更多 - - - 详情 - - - - 删除 - - - - + 详情 @@ -148,6 +107,7 @@ return { description: '订单商品模块表管理页面', // 表头 + biaoTi: '', columns: [ { title: '#', @@ -189,7 +149,7 @@ } ], url: { - list: "/ordergoodsmodule/orderGoodsModule/list", + list: "/ordergoodsmodule/orderGoodsModule/list?ordergoodsid="+this.$route.query.ordergoodsid, delete: "/ordergoodsmodule/orderGoodsModule/delete", deleteBatch: "/ordergoodsmodule/orderGoodsModule/deleteBatch", exportXlsUrl: "/ordergoodsmodule/orderGoodsModule/exportXls", @@ -202,6 +162,7 @@ }, created() { this.getSuperFieldList(); + this.biaoTi = this.$route.query.goodsname+"订单商品模块管理"; }, computed: { importExcelUrl: function(){ diff --git a/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue b/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue index 355cc426..5bcc5c1d 100644 --- a/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue +++ b/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue @@ -141,6 +141,8 @@ 生产 + 商品 + 详情 @@ -188,6 +190,14 @@ return parseInt(index)+1; } }, + { + title:'下单时间', + align:"center", + dataIndex: 'orderTime', + customRender:function (text) { + return !text?"":(text.length>10?text.substr(0,10):text) + } + }, { title:'是否子单', align:"center", @@ -198,14 +208,6 @@ align:"center", dataIndex: 'orderId_dictText' }, - { - title:'下单时间', - align:"center", - dataIndex: 'orderTime', - customRender:function (text) { - return !text?"":(text.length>10?text.substr(0,10):text) - } - }, { title:'订单编号', align:"center", @@ -424,6 +426,15 @@ } }, + shangpin(record){ + this.$router.push({ + path: '/ordergoods/OrderGoodsList', + query: { // 路由携带参数 + 'orderid': record.id, + 'ischild':record.ischild, + } + }); + }, getPcaText(code){ return this.pcaData.getText(code); }, diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoods/controller/OrderGoodsController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoods/controller/OrderGoodsController.java index 1a241bd3..1317f815 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoods/controller/OrderGoodsController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoods/controller/OrderGoodsController.java @@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.demo.zyorders.entity.ZyOrders; +import org.jeecg.modules.demo.zyorders.service.IZyOrdersService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -49,6 +51,8 @@ import org.jeecg.common.aspect.annotation.AutoLog; public class OrderGoodsController extends JeecgController { @Autowired private IOrderGoodsService orderGoodsService; + @Autowired + private IZyOrdersService zyOrdersService; /** * 分页列表查询 @@ -65,11 +69,34 @@ public class OrderGoodsController extends JeecgController queryPageList(OrderGoods orderGoods, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = orderGoodsService.page(page, queryWrapper); - return Result.OK(pageList); + HttpServletRequest req,@RequestParam(name="orderid",required=true)String orderid,@RequestParam(name="ischild",required=true)String ischild) { + if(orderid.equals("undefined")&&ischild.equals("undefined")){ + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = orderGoodsService.page(page, queryWrapper); + return Result.OK(pageList); + }else if(ischild.equals("0")){ + ZyOrders zyOrders = new ZyOrders(); + QueryWrapper queryWrapper1 = QueryGenerator.initQueryWrapper(zyOrders, req.getParameterMap()); + queryWrapper1.eq("order_id",orderid); + List list = zyOrdersService.list(queryWrapper1); + String ids = ""; + for (int i = 0 ; i < list.size() ; i++){ + ids = ids + list.get(i).getId()+","; + } + QueryWrapper queryWrapper2 = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap()); + queryWrapper2.in("orders_id",ids.substring(0,ids.length()-1).split(",")); + Page page = new Page(pageNo, pageSize); + IPage pageList = orderGoodsService.page(page, queryWrapper2); + return Result.OK(pageList); + }else { + QueryWrapper queryWrapper3 = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap()); + queryWrapper3.eq("orders_id",orderid); + Page page = new Page(pageNo, pageSize); + IPage pageList = orderGoodsService.page(page, queryWrapper3); + return Result.OK(pageList); + } + } /** diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsaccessories/controller/OrderGoodsAccessoriesController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsaccessories/controller/OrderGoodsAccessoriesController.java index 9ee06198..b0cacb91 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsaccessories/controller/OrderGoodsAccessoriesController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsaccessories/controller/OrderGoodsAccessoriesController.java @@ -65,8 +65,9 @@ public class OrderGoodsAccessoriesController extends JeecgController queryPageList(OrderGoodsAccessories orderGoodsAccessories, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + HttpServletRequest req,String ordergoodsid) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderGoodsAccessories, req.getParameterMap()); + queryWrapper.eq("order_goods_id",ordergoodsid); Page page = new Page(pageNo, pageSize); IPage pageList = orderGoodsAccessoriesService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsfabric/controller/OrderGoodsFabricController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsfabric/controller/OrderGoodsFabricController.java index c3f1f71e..7eeda25f 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsfabric/controller/OrderGoodsFabricController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsfabric/controller/OrderGoodsFabricController.java @@ -65,8 +65,9 @@ public class OrderGoodsFabricController extends JeecgController queryPageList(OrderGoodsFabric orderGoodsFabric, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + HttpServletRequest req,String ordergoodsid) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderGoodsFabric, req.getParameterMap()); + queryWrapper.eq("order_goods_id",ordergoodsid); Page page = new Page(pageNo, pageSize); IPage pageList = orderGoodsFabricService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsmodule/controller/OrderGoodsModuleController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsmodule/controller/OrderGoodsModuleController.java index caf05345..f8c834e7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsmodule/controller/OrderGoodsModuleController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsmodule/controller/OrderGoodsModuleController.java @@ -65,8 +65,9 @@ public class OrderGoodsModuleController extends JeecgController queryPageList(OrderGoodsModule orderGoodsModule, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + HttpServletRequest req,String ordergoodsid) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderGoodsModule, req.getParameterMap()); + queryWrapper.eq("order_goods_id",ordergoodsid); Page page = new Page(pageNo, pageSize); IPage pageList = orderGoodsModuleService.page(page, queryWrapper); return Result.OK(pageList); From 8c6280e8ada58fcb3b4b9615384ef9a2b6fc776b Mon Sep 17 00:00:00 2001 From: shenyuan Date: Wed, 1 Feb 2023 09:59:30 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/config/router.config.js | 4 + .../views/shopping/pages/gerenzhongxin.vue | 208 +++++++++++++++--- .../src/views/shopping/pages/orderDetails.vue | 48 ++++ 3 files changed, 232 insertions(+), 28 deletions(-) create mode 100644 ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue diff --git a/ant-design-vue-jeecg/src/config/router.config.js b/ant-design-vue-jeecg/src/config/router.config.js index 9031de02..9a5f5124 100644 --- a/ant-design-vue-jeecg/src/config/router.config.js +++ b/ant-design-vue-jeecg/src/config/router.config.js @@ -646,4 +646,8 @@ export const constantRouterMap = [ path: '/shopping/views/person',//这里是你需要设置新窗口打开的页面的路径s component: () => import('@/views/shopping/pages/gerenzhongxin'), }, + { + path: '/shopping/views/order',//这里是你需要设置新窗口打开的页面的路径s + component: () => import('@/views/shopping/pages/orderDetails'), + }, ] diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue index 824682e7..64ce25d0 100644 --- a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue +++ b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue @@ -8,28 +8,75 @@ 量体数据
- - - 我的账户 - - - 我的收藏 - - - 地址管理 - - - 发票管理 - - - - 全部订单 - - - 全部订单 - - + + 我的账户 + 我的收藏 + 地址管理 + + 发票管理 + + Option 1 + + + Option 2 + + + Option 3 + + + Option 4 + + + + 全部订单 + + 待支付 + + + 待收货 + + + 已完成 + + + 退换服务 + + + + +
+
+
+ 订单编号：{{item.orderNum}} + + 删除 + 未支付 + 已支付 + +
+
+
+ +
+
+

{{item.name}}

+

+ 款式：{{item.type}}|尺码：{{item.size}}|数量：{{item.num}}件 + ¥ {{item.price}} +

+

主辅料：{{item.material}}

+

+ 总计：¥ {{item.total}} + + 立即支付 + 查看详情 + +

+
+
+
+
@@ -42,6 +89,35 @@ components: { Header,Footer }, data() { return { + current: ['mail'], + allOrders:[ + { + id:1, + orderNum:'CN172839729', + pay:false, + url:require("../assets/cloth001.png"), + name:'商品名商品名商品名商品名商品', + type:'衬衫', + size:'XXL', + num:2, + price:2456, + material:'主料1，辅料2，辅料3，辅料4，辅料5，辅料6', + total:5912 + }, + { + id:2, + orderNum:'CN172839730', + pay:true, + url:require("../assets/cloth002.png"), + name:'商品名商品名商品名商品名商品', + type:'衬衫', + size:'XXL', + num:3, + price:2456, + material:'主料1，辅料2，辅料3，辅料4，辅料5，辅料6', + total:5912 + } + ], }; }, @@ -49,6 +125,11 @@ callback(key) { console.log(key); }, + menuChange(key){ + if(key == daizhifu){ + // this.allOrders.forEach() + } + } }, }; @@ -82,12 +163,83 @@ margin-bottom: 60px; } } - /*/deep/ .ant-tabs-nav{*/ - /* width: 100%;*/ - /* & >div{*/ - /* display: flex;*/ - /* justify-content: space-around;*/ - /* }*/ - /*}*/ + .menu{width: 1114px;margin:0 auto} + /deep/ .ant-menu{ + display: flex; + justify-content: space-between; + } + .orderList{ + /*margin-top: 60px;*/ + width: 1114px;margin:0 auto; + padding: 20px; + .item{ + border-bottom: 1px solid #DADADA; + padding-top: 30px; + .top{ + justify-content: space-between; + color: #333; + .delete{ + text-decoration: underline; + color: #1B1B1B; + margin-right: 20px; + } + .pay{ + color: #E53E41; + } + } + .bottom{ + justify-content: space-between; + .l{ + img{ + width: 230px; + height: 230px; + } + } + .r{ + min-width: 800px; + padding-top: 30px; + .name{ + font-weight: 500; + } + .kuanshi{ + justify-content: space-between; + } + .line{ + margin-left: 30px; + margin-right: 30px; + } + .heji{ + justify-content: space-between; + .btn{ + display: inline-block; + width: 145px; + height: 40px; + line-height: 40px; + text-align: center; + } + .ljzf{ + background: #333333; + color: #fff; + margin-right: 20px; + border: 1px solid #333333; + + &:hover{ + background: rgba(0,0,0,0.7); + /*color: #333;*/ + } + } + .ckxq{ + color: #333; + border: 1px solid #333333; + &:hover{ + background: #333; + color: #fff; + } + } + } + } + } + } + } diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue b/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue new file mode 100644 index 00000000..e2c370cd --- /dev/null +++ b/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue @@ -0,0 +1,48 @@ + + + + + From d3995a030ba3eb0759a28a46b2de9267fe401402 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854> Date: Wed, 1 Feb 2023 10:36:16 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=8F=91=E9=80=81=E5=88=B0=E4=BB=93?= =?UTF-8?q?=E5=BA=93=202.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productplan/ZyPlanWuLiaoDataDetail.vue | 42 +++------- .../delivery/service/IDeliveryService.java | 3 + .../service/impl/DeliveryServiceImpl.java | 81 ++++++++++++++++++- 3 files changed, 95 insertions(+), 31 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanWuLiaoDataDetail.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanWuLiaoDataDetail.vue index 7fd1dc3b..f2345571 100644 --- a/ant-design-vue-jeecg/src/views/productplan/ZyPlanWuLiaoDataDetail.vue +++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanWuLiaoDataDetail.vue @@ -38,8 +38,8 @@

计划面料清单

- +

计划辅料清单

@@ -71,11 +71,11 @@ import {mixinDevice} from '@/utils/mixin' import {JeecgListMixin} from '@/mixins/JeecgListMixin' import {filterObj} from "@/utils/util"; const columns1 = [ - { - title: '计划ID', - align: "center", - dataIndex: 'planId' - }, + // { + // title: '计划ID', + // align: "center", + // dataIndex: 'planId' + // }, { title: '面料', align: "center", @@ -89,11 +89,11 @@ const columns1 = [ ]; const columns2 = [ - { - title: '计划ID', - align: "center", - dataIndex: 'planId' - }, + // { + // title: '计划ID', + // align: "center", + // dataIndex: 'planId' + // }, { title: '辅料', align: "center", @@ -244,23 +244,7 @@ export default { this.loadRouteType = true; } }, - // showModal(id) { - // this.visible = true; - // this.id = id - // this.getDetailData() - // }, - // getDetailData() { - // getAction(this.url.detail, {id: this.id}).then((res) => { - // if (res.success) { - // this.data = res.result.records || res.result.records; - // console.log("data------------:" + JSON.stringify(this.data)); - // } else { - // this.$message.warning(res.message) - // } - // }).finally(() => { - // this.confirmLoading = false - // }) - // }, + handleOk(e) { this.confirmLoading = true; setTimeout(() => { diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/IDeliveryService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/IDeliveryService.java index b2830be6..07941a6f 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/IDeliveryService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/IDeliveryService.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.delivery.service; import org.jeecg.modules.demo.delivery.entity.Delivery; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.productplan.entity.ZyPlanProcess; /** * @Description: 出库表 @@ -12,4 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IDeliveryService extends IService { + void sendToRepository(String planId); + } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/impl/DeliveryServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/impl/DeliveryServiceImpl.java index f866ebc4..7aa4f2bd 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/impl/DeliveryServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/impl/DeliveryServiceImpl.java @@ -1,20 +1,97 @@ package org.jeecg.modules.demo.delivery.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.modules.demo.accessories.entity.ZyAccessories; +import org.jeecg.modules.demo.accessories.service.IZyAccessoriesService; import org.jeecg.modules.demo.delivery.entity.Delivery; import org.jeecg.modules.demo.delivery.mapper.DeliveryMapper; import org.jeecg.modules.demo.delivery.service.IDeliveryService; +import org.jeecg.modules.demo.fabric.entity.ZyFabric; +import org.jeecg.modules.demo.fabric.service.IZyFabricService; +import org.jeecg.modules.productplan.entity.ZyPlanAccessories; +import org.jeecg.modules.productplan.entity.ZyPlanFabric; +import org.jeecg.modules.productplan.entity.ZyProductPlan; +import org.jeecg.modules.productplan.service.IZyPlanAccessoriesService; +import org.jeecg.modules.productplan.service.IZyPlanFabricService; +import org.jeecg.modules.productplan.service.IZyProductPlanService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; /** * @Description: 出库表 * @Author: jeecg-boot - * @Date: 2023-01-10 + * @Date: 2023-01-10 * @Version: V1.0 */ @Service public class DeliveryServiceImpl extends ServiceImpl implements IDeliveryService { + @Autowired + private IZyProductPlanService iZyProductPlanService; + + @Autowired + private IZyPlanFabricService iZyPlanFabricService; + + @Autowired + private IZyPlanAccessoriesService iZyPlanAccessoriesService; + + @Autowired + IZyFabricService iZyFabricService; + + @Autowired + private IZyAccessoriesService iZyAccessoriesService; + + @Override + public void sendToRepository(String planId) { + ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId); + Optional.ofNullable(zyProductPlan).orElseThrow(() -> new JeecgBootException("生产计划不存在!")); + + List fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper() + .eq(ZyPlanFabric::getPlanId, planId)); + List deliveryList4Fabric = new LinkedList<>(); + Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> { + Delivery delivery = new Delivery(); + delivery.setDeliveryReason("0"); + delivery.setItemType("0"); + delivery.setAmount(e.getAmount().doubleValue()); +// delivery.setDeliveryTime(new Date()); +// delivery.setCarrierId("TODO"); +// delivery.setAdminId("TODO"); +// delivery.setStorehouseId("TODO"); + ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId()); + if (!ObjectUtils.isEmpty(zyFabric)) { + delivery.setItemCode(zyFabric.getFabricNumber()); + } + deliveryList4Fabric.add(delivery); + }); + this.saveBatch(deliveryList4Fabric); + + List accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper() + .eq(ZyPlanAccessories::getPlanId, planId)); + List deliveryList4accessories = new LinkedList<>(); + Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> { + Delivery delivery2 = new Delivery(); + delivery2.setDeliveryReason("0"); + delivery2.setItemType("1"); + delivery2.setAmount(e.getAmount().doubleValue()); +// delivery2.setDeliveryTime(new Date()); +// delivery2.setCarrierId("TODO"); +// delivery2.setAdminId("TODO"); +// delivery2.setStorehouseId("TODO"); + ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId()); + if (!ObjectUtils.isEmpty(zyAccessories)) { + delivery2.setItemCode(zyAccessories.getNums()); + } + deliveryList4accessories.add(delivery2); + }); + this.saveBatch(deliveryList4accessories); + } } From 10a7f04cd3a82f0f0507f8d5e27497d5e2bd48c8 Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Wed, 1 Feb 2023 10:37:23 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/CustomerInvoiceList.vue | 33 +++++++------- .../admin/modules/CustomerPaymentList1.vue | 3 +- .../controller/CustomerInvoiceController.java | 45 ++++++++++++++++++- .../mapper/CustomerInvoiceMapper.java | 18 ++++++++ .../service/ICustomerInvoiceService.java | 5 +++ .../impl/CustomerInvoiceServiceImpl.java | 34 ++++++++++++++ 6 files changed, 120 insertions(+), 18 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue b/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue index 350151d8..06427403 100644 --- a/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue +++ b/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue @@ -105,28 +105,22 @@ - 编辑 + 排序 + + 编辑 - - 详情 - - - - 删除 - - + 详情 + + + 删除 + + @@ -137,13 +131,15 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import CustomerInvoiceModal from './modules/CustomerInvoiceModal' + import CustomerInvoiceModal1 from './modules/CustomerInvoiceModal1' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { name: 'CustomerInvoiceList', mixins:[JeecgListMixin, mixinDevice], components: { - CustomerInvoiceModal + CustomerInvoiceModal, + CustomerInvoiceModal1 }, data () { return { @@ -248,6 +244,11 @@ }, }, methods: { + paixu: function (record) { + this.$refs.modalFormpaixu.edit(record.userId); + this.$refs.modalFormpaixu.title = record.userId_dictText+"测体管理"; + this.$refs.modalFormpaixu.disableSubmit = false; + }, initDictConfig(){ }, getSuperFieldList(){ diff --git a/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue b/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue index a969c57a..f60e0c98 100644 --- a/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue +++ b/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue @@ -123,7 +123,7 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' - + import { getAction } from '@/api/manage' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { @@ -202,6 +202,7 @@ exportXlsUrl: "/customerpayment/customerPayment/exportXls", importExcelUrl: "customerpayment/customerPayment/importExcel", + }, dictOptions:{}, superFieldList:[], diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java index 4d479e21..7e731d06 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java @@ -74,6 +74,29 @@ public class CustomerInvoiceController extends JeecgController queryPageList1(CustomerInvoice customerInvoice, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(customerInvoice, req.getParameterMap()); + queryWrapper.eq("user_id",customerInvoice.getUserId()); + Page page = new Page(pageNo, pageSize); + IPage pageList = customerInvoiceService.page(page, queryWrapper); + return Result.OK(pageList); + } + /** * 添加 * @@ -243,7 +266,27 @@ public class CustomerInvoiceController extends JeecgController shang(@RequestParam(name="id",required=true) String id) { + System.out.println(id); + customerInvoiceService.up(id); + return Result.ok("升序成功"); + } + + + @AutoLog(value = "排序") + @ApiOperation(value="排序", notes="排序") + @GetMapping(value = "/down") + public Result xia(@RequestParam(name="id",required=true) String id) { + int a=customerInvoiceService.findSort(id); + if(a==0){ + return Result.error("当前已经是最低级别！！！");}else { + customerInvoiceService.down(id); + return Result.ok("降序成功"); + } + } } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java index 56b2e273..ee8d8130 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java @@ -3,6 +3,8 @@ package org.jeecg.modules.demo.customerinvoice.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import org.jeecg.modules.demo.customerinvoice.entity.CustomerInvoice; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +16,20 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface CustomerInvoiceMapper extends BaseMapper { + + @Select("select sort from customer_invoice where id=#{id} ") + Integer upfindsort(String id); + + @Select("select id from customer_invoice where sort=#{i} ") + String findproid(int i); + + @Update("update customer_invoice set sort =#{i} where id = #{id} ") + void innew(String id, int i); + + @Update("update customer_invoice set sort =#{sort} where id = #{proid} ") + void innewpro(String proid, Integer sort); + + @Select("select sort from customer_invoice where id=#{id} ") + int findSort(String id); + } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java index c8ac60f7..5988b99a 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java @@ -11,4 +11,9 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ICustomerInvoiceService extends IService { + void down(String id); + + int findSort(String id); + + void up(String id); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java index 47804111..9cade0cc 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.customerinvoice.service.impl; import org.jeecg.modules.demo.customerinvoice.entity.CustomerInvoice; import org.jeecg.modules.demo.customerinvoice.mapper.CustomerInvoiceMapper; import org.jeecg.modules.demo.customerinvoice.service.ICustomerInvoiceService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,4 +17,37 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class CustomerInvoiceServiceImpl extends ServiceImpl implements ICustomerInvoiceService { + @Autowired + CustomerInvoiceMapper customerInvoiceMapper; + + @Override + public void up(String id) { + Integer sort = customerInvoiceMapper.upfindsort(id); + if (sort>0) { + //升序前找到后一个排序 + String proid = customerInvoiceMapper.findproid(sort + 1); + if (proid!="") { + //调换排序 + customerInvoiceMapper.innew(id,sort+1); + customerInvoiceMapper.innewpro(proid,sort); + } + } + } + + @Override + public int findSort(String id) { + return customerInvoiceMapper.findSort(id); + } + + @Override + public void down(String id) { + Integer sort = customerInvoiceMapper.upfindsort(id); + if (sort>0) { + String proid = customerInvoiceMapper.findproid(sort - 1); + if (proid!="") { + customerInvoiceMapper.innew(id,sort-1); + customerInvoiceMapper.innewpro(proid,sort); + } + } + } } From 3be5a51fefdc1218b96a91d3c037a7a0e237a3b0 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854> Date: Wed, 1 Feb 2023 10:40:26 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=8F=91=E9=80=81=E5=88=B0=E4=BB=93?= =?UTF-8?q?=E5=BA=93=202.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ZyPlanProcessServiceImpl.java | 91 ++++++++++--------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java index 63b0afe0..bd81fbe7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java @@ -515,51 +515,52 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper() - .eq(ZyPlanFabric::getPlanId, zyPlanProcess.getPlanId())); - List deliveryList4Fabric = new LinkedList<>(); - Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> { - Delivery delivery = new Delivery(); - delivery.setDeliveryReason("0"); - delivery.setDeliveryTime(new Date()); - delivery.setItemType("0"); - delivery.setAmount(e.getAmount().doubleValue()); - delivery.setCarrierId("admin"); - delivery.setAdminId("admin"); - delivery.setStorehouseId("TODO"); - ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId()); - if (!ObjectUtils.isEmpty(zyFabric)) { - delivery.setItemCode(zyFabric.getFabricNumber()); - } - deliveryList4Fabric.add(delivery); - }); - iDeliveryService.saveBatch(deliveryList4Fabric); - - List accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper() - .eq(ZyPlanAccessories::getPlanId, zyPlanProcess.getPlanId())); - List deliveryList4accessories = new LinkedList<>(); - Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> { - Delivery delivery2 = new Delivery(); - delivery2.setDeliveryReason("0"); - delivery2.setDeliveryTime(new Date()); - delivery2.setItemType("1"); - delivery2.setAmount(e.getAmount().doubleValue()); - delivery2.setCarrierId("admin"); - delivery2.setAdminId("admin"); - delivery2.setStorehouseId("TODO"); - ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId()); - if (!ObjectUtils.isEmpty(zyAccessories)) { - delivery2.setItemCode(zyAccessories.getNums()); - } - deliveryList4accessories.add(delivery2); - }); - iDeliveryService.saveBatch(deliveryList4accessories); +// String planId = zyPlanProcess.getPlanId(); +// ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId); +// if (ObjectUtils.isEmpty(zyProductPlan)) { +// throw new JeecgBootException("生产计划不存在!"); +// } + +// List fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper() +// .eq(ZyPlanFabric::getPlanId, zyPlanProcess.getPlanId())); +// List deliveryList4Fabric = new LinkedList<>(); +// Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> { +// Delivery delivery = new Delivery(); +// delivery.setDeliveryReason("0"); +// delivery.setDeliveryTime(new Date()); +// delivery.setItemType("0"); +// delivery.setAmount(e.getAmount().doubleValue()); +// delivery.setCarrierId("admin"); +// delivery.setAdminId("admin"); +// delivery.setStorehouseId("TODO"); +// ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId()); +// if (!ObjectUtils.isEmpty(zyFabric)) { +// delivery.setItemCode(zyFabric.getFabricNumber()); +// } +// deliveryList4Fabric.add(delivery); +// }); +// iDeliveryService.saveBatch(deliveryList4Fabric); +// +// List accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper() +// .eq(ZyPlanAccessories::getPlanId, zyPlanProcess.getPlanId())); +// List deliveryList4accessories = new LinkedList<>(); +// Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> { +// Delivery delivery2 = new Delivery(); +// delivery2.setDeliveryReason("0"); +// delivery2.setDeliveryTime(new Date()); +// delivery2.setItemType("1"); +// delivery2.setAmount(e.getAmount().doubleValue()); +// delivery2.setCarrierId("admin"); +// delivery2.setAdminId("admin"); +// delivery2.setStorehouseId("TODO"); +// ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId()); +// if (!ObjectUtils.isEmpty(zyAccessories)) { +// delivery2.setItemCode(zyAccessories.getNums()); +// } +// deliveryList4accessories.add(delivery2); +// }); +// iDeliveryService.saveBatch(deliveryList4accessories); + iDeliveryService.sendToRepository(zyPlanProcess.getPlanId()); } From 9abbea76a752bc034b56fbb01cda8168a71733d1 Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Wed, 1 Feb 2023 10:40:37 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/modules/CustomerInvoiceList1.vue | 300 ++++++++++++++++++ .../admin/modules/CustomerInvoiceModal1.vue | 60 ++++ 2 files changed, 360 insertions(+) create mode 100644 ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceList1.vue create mode 100644 ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceModal1.vue diff --git a/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceList1.vue b/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceList1.vue new file mode 100644 index 00000000..8e29d941 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceList1.vue @@ -0,0 +1,300 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceModal1.vue b/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceModal1.vue new file mode 100644 index 00000000..1510631e --- /dev/null +++ b/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceModal1.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file