From 2bd9abe19247d500509983831d5874db337417d8 Mon Sep 17 00:00:00 2001 From: "CJYXTX\\27961" <971623072tx> Date: Wed, 3 Apr 2024 09:39:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A3=9E=E4=B9=A6=E9=97=AE?= =?UTF-8?q?=E9=A2=98276=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98=E9=9B=86?= =?UTF-8?q?=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/scm/ProductWarehouseMapper.xml | 14 +- .../resources/mapper/scm/WorkOrderMapper.xml | 24 +- .../service/WarehousingOutboundService.java | 3 + .../service/WarehousingReportlossService.java | 3 + .../service/WarehousingReturnService.java | 3 + .../service/WarehousingStorageService.java | 3 + .../java/jnpf/service/WorkOrderService.java | 2 + .../impl/WarehousingOutboundServiceImpl.java | 75 ++ .../WarehousingReportlossServiceImpl.java | 50 + .../impl/WarehousingReturnServiceImpl.java | 57 ++ .../impl/WarehousingStorageServiceImpl.java | 74 ++ .../service/impl/WorkOrderServiceImpl.java | 63 +- .../ProductWarehouseController.java | 2 +- .../WarehousingOutboundController.java | 22 + .../WarehousingReportlossController.java | 22 + .../WarehousingReturnController.java | 23 + .../WarehousingStorageController.java | 22 + .../jnpf/controller/WorkOrderController.java | 309 +++++- .../jnpf/entity/ProductWarehouseEntity.java | 7 + .../entity/WarehousingReportlossEntity.java | 3 + .../jnpf/entity/WorkOrderPrimaryEntity.java | 6 + .../jnpf/entity/WorkOrderProductEntity.java | 6 + .../WarehousingReportlossForm.java | 3 + .../workorder/WorkOrderPrimaryModel.java | 10 + .../workorder/WorkOrderProductModel.java | 5 + .../scm/publicPopup/BomProductGoodsBox.vue | 25 +- .../publicPopup/BomProductGoodsBoxOnly.vue | 44 +- .../jnpf-web/src/views/scm/workorder/form.vue | 147 ++- .../src/views/scm/workorder/formOver.vue | 936 ++++++++++-------- .../src/views/scm/workorder/index.vue | 4 +- 30 files changed, 1441 insertions(+), 526 deletions(-) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ProductWarehouseMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ProductWarehouseMapper.xml index 794675fd..b8d8edd8 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ProductWarehouseMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ProductWarehouseMapper.xml @@ -14,6 +14,7 @@ + @@ -30,6 +31,9 @@ + + + SELECT - a.id, - a.id AS productId, - a.name AS name, - a.spec, - a.bar_code AS barCode, + b.id, + b.id AS productId, + b.NAME AS NAME, + b.spec, + b.bar_code AS barCode, CASE - a.inventory_type + b.inventory_type WHEN 1 THEN '原材料' WHEN 2 THEN @@ -55,12 +56,17 @@ WHEN 3 THEN '产成品' END AS inventoryType, - JgFnUnitName ( a.inventory_unit_id ) AS inventoryUnitIds + JgFnUnitName ( b.inventory_unit_id ) AS inventoryUnitIds, + a.proportion_num AS theoryNum FROM - jg_product a + jg_bom_item_value a + LEFT JOIN jg_product b ON a.product_id = b.id + AND b.f_delete_mark + IS NULL LEFT JOIN jg_bom c ON a.bom_id = c.id + AND c.f_delete_mark IS NULL WHERE a.f_delete_mark IS NULL - AND a.id = #{id} + AND c.id = #{id} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java index b76f28d1..a3e67486 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java @@ -39,6 +39,9 @@ public interface WarehousingOutboundService extends IService { String checkForm(WorkOrderForm form,int i); void saveOrUpdate(WorkOrderForm workOrderForm,String id, boolean isSave) throws Exception; + + void saveOrUpdateWork(WorkOrderForm workOrderForm,String id, boolean isSave) throws Exception; //加工单根据商品成品查询bom带出原材料 List getWorkBom(String id); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java index 0f072ca3..9c4e853d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java @@ -540,6 +540,81 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl WarehousingOutboundPoundlistqueryWrapper = new QueryWrapper<>(); + WarehousingOutboundPoundlistqueryWrapper.lambda().eq(WarehousingOutboundPoundlistEntity::getWarehousingOutboundId, entity.getId()); + warehousingOutboundPoundlistService.remove(WarehousingOutboundPoundlistqueryWrapper); + } + if (warehousingOutboundForm.getWarehousingOutboundPoundlistList()!=null){ + List tableField114 = JsonUtil.getJsonToList(warehousingOutboundForm.getWarehousingOutboundPoundlistList(),WarehousingOutboundPoundlistEntity.class); + for(WarehousingOutboundPoundlistEntity entitys : tableField114){ + entitys.setId(RandomUtil.uuId()); + entitys.setWarehousingOutboundId(entity.getId()); + if(isSave){ + }else{ + } + warehousingOutboundPoundlistService.saveOrUpdate(entitys); + } + } + //WarehousingOutboundProduct子表数据新增修改 + if(!isSave){ + QueryWrapper WarehousingOutboundProductqueryWrapper = new QueryWrapper<>(); + WarehousingOutboundProductqueryWrapper.lambda().eq(WarehousingOutboundProductEntity::getWarehousingOutboundId, entity.getId()); + warehousingOutboundProductService.remove(WarehousingOutboundProductqueryWrapper); + } + if (warehousingOutboundForm.getWarehousingOutboundProductList()!=null){ + List tableField119 = JsonUtil.getJsonToList(warehousingOutboundForm.getWarehousingOutboundProductList(),WarehousingOutboundProductEntity.class); + for(WarehousingOutboundProductEntity entitys : tableField119){ + entitys.setId(RandomUtil.uuId()); + entitys.setWarehousingOutboundId(entity.getId()); + if(isSave){ + }else{ + } + warehousingOutboundProductService.saveOrUpdate(entitys); + } + } + } + + @Override public String queryOutboundNumber(String id) { return warehousingOutboundMapper.queryOutboundNumber(id); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingReportlossServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingReportlossServiceImpl.java index 3c0c90dd..5c31922d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingReportlossServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingReportlossServiceImpl.java @@ -407,6 +407,56 @@ public class WarehousingReportlossServiceImpl extends ServiceImpl WarehousingReportlossProductqueryWrapper = new QueryWrapper<>(); + WarehousingReportlossProductqueryWrapper.lambda().eq(WarehousingReportlossProductEntity::getReportlossId, entity.getId()); + warehousingReportlossProductService.remove(WarehousingReportlossProductqueryWrapper); + } + if (warehousingReportlossForm.getWarehousingReportlossProductList()!=null){ + List tableField109 = JsonUtil.getJsonToList(warehousingReportlossForm.getWarehousingReportlossProductList(),WarehousingReportlossProductEntity.class); + for(WarehousingReportlossProductEntity entitys : tableField109){ + entitys.setId(RandomUtil.uuId()); + entitys.setReportlossId(entity.getId()); + if(isSave){ + }else{ + } + warehousingReportlossProductService.saveOrUpdate(entitys); + } + } + } + @Override public String queryReportlossSum(String id) { return warehousingReportlossMapper.queryReportlossSum(id); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingReturnServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingReturnServiceImpl.java index ee7e3175..b4c8d789 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingReturnServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingReturnServiceImpl.java @@ -435,6 +435,63 @@ public class WarehousingReturnServiceImpl extends ServiceImpl WarehousingReturnProductqueryWrapper = new QueryWrapper<>(); + WarehousingReturnProductqueryWrapper.lambda().eq(WarehousingReturnProductEntity::getReturnId, entity.getId()); + warehousingReturnProductService.remove(WarehousingReturnProductqueryWrapper); + } + if (warehousingReturnForm.getWarehousingReturnProductList()!=null){ + List tableField116 = JsonUtil.getJsonToList(warehousingReturnForm.getWarehousingReturnProductList(),WarehousingReturnProductEntity.class); + for(WarehousingReturnProductEntity entitys : tableField116){ + entitys.setId(RandomUtil.uuId()); + entitys.setReturnId(entity.getId()); + if(isSave){ + }else{ + } + warehousingReturnProductService.saveOrUpdate(entitys); + } + } + } + @Override public String queryReturnNum(String id) { return warehousingReturnMapper.queryReturnNum(id); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java index a823e0df..0e8960a3 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java @@ -540,6 +540,80 @@ public class WarehousingStorageServiceImpl extends ServiceImpl WarehousingStoragePoundlistqueryWrapper = new QueryWrapper<>(); + WarehousingStoragePoundlistqueryWrapper.lambda().eq(WarehousingStoragePoundlistEntity::getWarehousingStorageId, entity.getId()); + warehousingStoragePoundlistService.remove(WarehousingStoragePoundlistqueryWrapper); + } + if (warehousingStorageForm.getWarehousingStoragePoundlistList()!=null){ + List tableField114 = JsonUtil.getJsonToList(warehousingStorageForm.getWarehousingStoragePoundlistList(),WarehousingStoragePoundlistEntity.class); + for(WarehousingStoragePoundlistEntity entitys : tableField114){ + entitys.setId(RandomUtil.uuId()); + entitys.setWarehousingStorageId(entity.getId()); + if(isSave){ + }else{ + } + warehousingStoragePoundlistService.saveOrUpdate(entitys); + } + } + //WarehousingStorageProduct子表数据新增修改 + if(!isSave){ + QueryWrapper WarehousingStorageProductqueryWrapper = new QueryWrapper<>(); + WarehousingStorageProductqueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId, entity.getId()); + warehousingStorageProductService.remove(WarehousingStorageProductqueryWrapper); + } + if (warehousingStorageForm.getWarehousingStorageProductList()!=null){ + List tableField119 = JsonUtil.getJsonToList(warehousingStorageForm.getWarehousingStorageProductList(),WarehousingStorageProductEntity.class); + for(WarehousingStorageProductEntity entitys : tableField119){ + entitys.setId(RandomUtil.uuId()); + entitys.setWarehousingStorageId(entity.getId()); + if(isSave){ + entitys.setBatchNumber(generaterSwapUtil.getBillNumber("picihao", false)); + }else{ + entitys.setBatchNumber(generaterSwapUtil.getBillNumber("picihao", false)); + } + warehousingStorageProductService.saveOrUpdate(entitys); + } + } + } + + @Override public String queryRealityNumber(String id) { return warehousingStorageMapper.queryrealityNumber(id); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java index e4089e50..80dd936b 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java @@ -445,11 +445,64 @@ public class WorkOrderServiceImpl extends ServiceImpl WorkOrderProductqueryWrapper = new QueryWrapper<>(); + WorkOrderProductqueryWrapper.lambda().eq(WorkOrderProductEntity::getWorkId, entity.getId()); + workOrderProductService.remove(WorkOrderProductqueryWrapper); + } + if (workOrderForm.getWorkOrderProductList()!=null){ + List tableField116 = JsonUtil.getJsonToList(workOrderForm.getWorkOrderProductList(),WorkOrderProductEntity.class); + for(WorkOrderProductEntity entitys : tableField116){ + entitys.setId(RandomUtil.uuId()); + entitys.setWorkId(entity.getId()); + if(isSave){ + }else{ + } + workOrderProductService.saveOrUpdate(entitys); + } + } + //WorkOrderPrimary子表数据新增修改 + if(!isSave){ + QueryWrapper WorkOrderPrimaryqueryWrapper = new QueryWrapper<>(); + WorkOrderPrimaryqueryWrapper.lambda().eq(WorkOrderPrimaryEntity::getWorkId, entity.getId()); + workOrderPrimaryService.remove(WorkOrderPrimaryqueryWrapper); + } + if (workOrderForm.getWorkOrderPrimaryList()!=null){ + List tableField126 = JsonUtil.getJsonToList(workOrderForm.getWorkOrderPrimaryList(),WorkOrderPrimaryEntity.class); + for(WorkOrderPrimaryEntity entitys : tableField126){ + entitys.setId(RandomUtil.uuId()); + entitys.setWorkId(entity.getId()); + if(isSave){ + }else{ + } + workOrderPrimaryService.saveOrUpdate(entitys); + } + } + } + + @Override + public void saveOrUpdateWork(WorkOrderForm workOrderForm, String id, boolean isSave) throws Exception { + UserInfo userInfo=userProvider.get(); + UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); + workOrderForm = JsonUtil.getJsonToBean( + generaterSwapUtil.swapDatetime(WorkOrderConstant.getFormData(),workOrderForm),WorkOrderForm.class); + WorkOrderEntity entity = JsonUtil.getJsonToBean(workOrderForm, WorkOrderEntity.class); + + if(isSave){ +// String mainId = id ; +// entity.setCode(generaterSwapUtil.getBillNumber("workOrder", false)); +// entity.setId(mainId); +// entity.setFlowId(workOrderForm.getFlowId()); +// entity.setVersion(0); + }else{ +// entity.setCode(generaterSwapUtil.getBillNumber("workOrder", false)); +// entity.setFlowId(workOrderForm.getFlowId()); + } + this.saveOrUpdate(entity); //WorkOrderProduct子表数据新增修改 diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java index 0d6a3d0d..eb1e5e70 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java @@ -143,7 +143,7 @@ public class ProductWarehouseController { realList.add(productWarehouseMap); } //数据转换 - realList = generaterSwapUtil.swapDataList(realList, ProductWarehouseConstant.getFormData(), ProductWarehouseConstant.getColumnData(), productWarehousePagination.getModuleId(),false); +// realList = generaterSwapUtil.swapDataList(realList, ProductWarehouseConstant.getFormData(), ProductWarehouseConstant.getColumnData(), productWarehousePagination.getModuleId(),false); //流程状态添加 // for(Map vo:realList){ // FlowTaskEntity flowTaskEntity = generaterSwapUtil.getInfoSubmit(String.valueOf(vo.get("id")), FlowTaskEntity::getStatus); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java index e55efac2..bbc7472d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java @@ -167,6 +167,28 @@ public class WarehousingOutboundController { } return ActionResult.success("创建成功"); } + + /** + * 创建work + * + * @param warehousingOutboundForm + * @return + */ + @PostMapping("/{idWork}") + @Operation(summary = "创建") + public ActionResult createWork(@PathVariable("id") String id, @RequestBody @Valid WarehousingOutboundForm warehousingOutboundForm) { +// String b = warehousingOutboundService.checkForm(warehousingOutboundForm,0); +// if (StringUtil.isNotEmpty(b)){ +// return ActionResult.fail(b ); +// } + try{ + warehousingOutboundService.saveOrUpdateWork(warehousingOutboundForm, id ,true); + }catch(Exception e){ + return ActionResult.fail("新增数据失败"); + } + return ActionResult.success("创建成功"); + } + /** * 导出Excel * diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java index 5e6196cf..52231dfe 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java @@ -149,6 +149,28 @@ public class WarehousingReportlossController { } return ActionResult.success("创建成功"); } + + /** + * 创建加工单 + * + * @param warehousingReportlossForm + * @return + */ + @PostMapping("/{idWork}") + @Operation(summary = "创建") + public ActionResult createWork(@PathVariable("id") String id, @RequestBody @Valid WarehousingReportlossForm warehousingReportlossForm) { +// String b = warehousingReportlossService.checkForm(warehousingReportlossForm,0); +// if (StringUtil.isNotEmpty(b)){ +// return ActionResult.fail(b ); +// } + try{ + warehousingReportlossService.saveOrUpdateWork(warehousingReportlossForm, id ,true); + }catch(Exception e){ + return ActionResult.fail("新增数据失败"); + } + return ActionResult.success("创建成功"); + } + /** * 导出Excel * diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReturnController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReturnController.java index dfd6599f..2dba4b87 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReturnController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReturnController.java @@ -149,6 +149,29 @@ public class WarehousingReturnController { } return ActionResult.success("创建成功"); } + + + /** + * 创建 + * + * @param warehousingReturnForm + * @return + */ + @PostMapping("/{idWork}") + @Operation(summary = "创建") + public ActionResult createWork(@PathVariable("id") String id, @RequestBody @Valid WarehousingReturnForm warehousingReturnForm) { +// String b = warehousingReturnService.checkForm(warehousingReturnForm,0); +// if (StringUtil.isNotEmpty(b)){ +// return ActionResult.fail(b ); +// } + try{ + warehousingReturnService.saveOrUpdateWork(warehousingReturnForm, id ,true); + }catch(Exception e){ + return ActionResult.fail("新增数据失败"); + } + return ActionResult.success("创建成功"); + } + /** * 导出Excel * diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java index f81071d0..f2c2c100 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java @@ -166,6 +166,28 @@ public class WarehousingStorageController { } return ActionResult.success("创建成功"); } + + /** + * work创建入库 + * + * @param warehousingStorageForm + * @return + */ + @PostMapping("/{idWork}") + @Operation(summary = "创建") + public ActionResult createWork(@PathVariable("id") String id, @RequestBody @Valid WarehousingStorageForm warehousingStorageForm) { +// String b = warehousingStorageService.checkForm(warehousingStorageForm,0); +// if (StringUtil.isNotEmpty(b)){ +// return ActionResult.fail(b ); +// } + try{ + warehousingStorageService.saveOrUpdateWork(warehousingStorageForm, id ,true); + }catch(Exception e){ + return ActionResult.fail("新增数据失败"); + } + return ActionResult.success("创建成功"); + } + /** * 导出Excel * diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java index e6b93c19..ccebdc07 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java @@ -16,6 +16,10 @@ import jnpf.model.warehousingoutbound.WarehousingOutboundForm; import jnpf.model.warehousingoutbound.WarehousingOutboundProductModel; import jnpf.model.warehousingreceive.WarehousingReceiveForm; import jnpf.model.warehousingreceive.WarehousingReceiveProductModel; +import jnpf.model.warehousingreportloss.WarehousingReportlossForm; +import jnpf.model.warehousingreportloss.WarehousingReportlossProductModel; +import jnpf.model.warehousingreturn.WarehousingReturnForm; +import jnpf.model.warehousingreturn.WarehousingReturnProductModel; import jnpf.model.warehousingstorage.WarehousingStorageForm; import jnpf.model.warehousingstorage.WarehousingStoragePoundlistModel; import jnpf.model.warehousingstorage.WarehousingStorageProductModel; @@ -30,6 +34,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.math.BigDecimal; import java.util.*; import jnpf.annotation.JnpfField; import jnpf.base.vo.PageListVO; @@ -94,6 +99,10 @@ public class WorkOrderController { @Autowired WarehousingReceiveController warehousingReceiveController; @Autowired private WarehousingOutboundController warehousingOutboundController; + @Autowired + private WarehousingReturnController warehousingReturnController; + @Autowired + private WarehousingReportlossController warehousingReportlossController; @Autowired @@ -419,7 +428,7 @@ public class WorkOrderController { if(flowTaskNodeEntityList != null && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())){ //审核通过 if (workOrderForm.getType().equals("1")){ - workOrderForm.setStatus("4"); + workOrderForm.setStatus("5"); } else if (workOrderForm.getType().equals("2")){ workOrderForm.setStatus("2"); } @@ -443,8 +452,8 @@ public class WorkOrderController { warehousingStorageForm.setWarehousingStorageProductList(list); } - warehousingStorageController.create(id,warehousingStorageForm); - //原材料生成领用单和出库单 + warehousingStorageController.createWork(id,warehousingStorageForm); + //原材料生成领用单和出库单和返库单和报损单 //领用单 WarehousingReceiveForm warehousingReceiveForm=new WarehousingReceiveForm(); warehousingReceiveForm.setWarehouseId(workOrderForm.getWarehouseId()); //仓库 @@ -472,11 +481,9 @@ public class WorkOrderController { receiveWrapper.lambda().eq(WarehousingReceiveEntity::getBusinessId, id); // flowTaskNodeEntityQueryWrapper.lambda().eq(WarehousingReceiveEntity::getTaskId, flowTaskEntity.getId()); List warehousingReceiveEntityList = warehousingReceiveService.list(receiveWrapper); - warehousingOutboundForm.setWarehousingOutboundType("14"); warehousingOutboundForm.setWarehousingId(warehousingReceiveEntityList.get(0).getId()); warehousingOutboundForm.setWarehouseId(warehousingReceiveForm.getWarehouseId()); - List warehousingOutboundProductModelList =new ArrayList<>(); for (WarehousingReceiveProductModel warehousingReceiveProductModel1:warehousingReceiveList){ WarehousingOutboundProductModel warehousingOutboundProductModel=new WarehousingOutboundProductModel(); @@ -485,11 +492,61 @@ public class WorkOrderController { warehousingOutboundProductModel.setOutboundUnit(unit); //加工单位 warehousingOutboundProductModel.setOutboundNumber(warehousingReceiveProductModel1.getUsedreturnNumber()); //实际发货量 warehousingOutboundProductModelList.add(warehousingOutboundProductModel); - warehousingOutboundForm.setWarehousingOutboundProductList(warehousingOutboundProductModelList); - } - warehousingOutboundController.create(id,warehousingOutboundForm); + warehousingOutboundController.createWork(id,warehousingOutboundForm); + //返库单 + WarehousingReturnForm warehousingReturnForm=new WarehousingReturnForm(); + warehousingReturnForm.setBusinessId(workOrderForm.getId()); + warehousingReturnForm.setWarehouseId(workOrderForm.getWarehouseId()); + warehousingReturnForm.setReturnReason("8"); + warehousingReturnForm.setRemark(workOrderForm.getRemark()); + BigDecimal retNum = new BigDecimal("0"); + BigDecimal zero = BigDecimal.ZERO; + List warehousingReturnProductModelList =new ArrayList<>(); + for (WorkOrderPrimaryModel WorkOrderPrimaryModel:workOrderForm.getWorkOrderPrimaryList()){ + if (WorkOrderPrimaryModel.getReturnNum()==null||WorkOrderPrimaryModel.getReturnNum().equals("0")){ + }else{ + WarehousingReturnProductModel warehousingReturnProductModel=new WarehousingReturnProductModel(); + warehousingReturnProductModel.setProductId(WorkOrderPrimaryModel.getProductId()); + warehousingReturnProductModel.setReturnUnit(unit); + warehousingReturnProductModel.setCargoId(WorkOrderPrimaryModel.getCargoId()); + warehousingReturnProductModel.setReturnNumber(WorkOrderPrimaryModel.getReturnNum()); + warehousingReturnProductModelList.add(warehousingReturnProductModel); + warehousingReturnForm.setWarehousingReturnProductList(warehousingReturnProductModelList); + retNum =new BigDecimal(WorkOrderPrimaryModel.getReturnNum()); + } + } + if (retNum.compareTo(zero)>0){ + warehousingReturnController.createWork(id,warehousingReturnForm); + } + //报损单 + WarehousingReportlossForm warehousingReportlossForm=new WarehousingReportlossForm(); + warehousingReportlossForm.setReportlossType("4"); + warehousingReportlossForm.setReportlossReason("5"); + warehousingReportlossForm.setWarehouseId(workOrderForm.getWarehouseId()); + warehousingReportlossForm.setBusinessId(workOrderForm.getId()); + warehousingReportlossForm.setRemark(workOrderForm.getRemark()); + BigDecimal retNum1 = new BigDecimal("0"); + BigDecimal zero1 = BigDecimal.ZERO; + List warehousingReportlossProductModelList =new ArrayList<>(); + for (WorkOrderPrimaryModel WorkOrderPrimaryModel:workOrderForm.getWorkOrderPrimaryList()){ + if (WorkOrderPrimaryModel.getReportlossNum()==null||WorkOrderPrimaryModel.getReportlossNum().equals("0")){ + }else{ + WarehousingReportlossProductModel warehousingReportlossProductModel=new WarehousingReportlossProductModel(); + warehousingReportlossProductModel.setProductId(WorkOrderPrimaryModel.getProductId()); + warehousingReportlossProductModel.setReportlossUnit(unit); + warehousingReportlossProductModel.setCargoId(WorkOrderPrimaryModel.getCargoId()); + warehousingReportlossProductModel.setReportlossNumber(WorkOrderPrimaryModel.getReportlossNum()); + warehousingReportlossProductModelList.add(warehousingReportlossProductModel); + warehousingReportlossForm.setWarehousingReportlossProductList(warehousingReportlossProductModelList); + retNum1 =new BigDecimal(WorkOrderPrimaryModel.getReportlossNum()); + } + } + if (retNum1.compareTo(zero1)>0){ + warehousingReportlossController.createWork(id,warehousingReportlossForm); + } + } } } @@ -576,6 +633,44 @@ public class WorkOrderController { return ActionResult.success(workOrderMap); } + /** + * 获取详情(编辑页)完成加工 + * 编辑页面使用-不转换数据 + * @param id + * @return + */ + @Operation(summary = "信息") + @GetMapping("/work/{id}") + public ActionResult infoWork(@PathVariable("id") String id){ + WorkOrderEntity entity= workOrderService.getInfo(id); + if(entity==null){ + return ActionResult.fail("表单数据不存在！"); + } + + Map workOrderMap=JsonUtil.entityToMap(entity); + workOrderMap.put("id", workOrderMap.get("id")); + //副表数据 + //子表数据 + List workOrderProductList = workOrderService.getWorkOrderProductList(entity.getId()); +// List workOrderProductEntityList =new ArrayList<>(); + for (WorkOrderProductEntity workOrderProductEntity:workOrderProductList){ + workOrderProductEntity.setNums(workOrderProductEntity.getProportionNum()); + workOrderProductEntity.setProportionNum(null); +// workOrderProductEntityList.add(workOrderProductEntity); + } + workOrderMap.put("workOrderProductList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(workOrderProductList))); + List workOrderPrimaryList = workOrderService.getWorkOrderPrimaryList(entity.getId()); + for (WorkOrderPrimaryEntity workOrderPrimaryEntity:workOrderPrimaryList){ + workOrderPrimaryEntity.setReturnNum(null); + workOrderPrimaryEntity.setReportlossNum(null); + workOrderPrimaryEntity.setRealityNum(null); + } + workOrderMap.put("workOrderPrimaryList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(workOrderPrimaryList))); + workOrderMap = generaterSwapUtil.swapDataForm(workOrderMap,WorkOrderConstant.getFormData(),WorkOrderConstant.TABLEFIELDKEY,WorkOrderConstant.TABLERENAMES); + return ActionResult.success(workOrderMap); + } + + /** * 更新状态 * @param id @@ -611,21 +706,197 @@ public class WorkOrderController { List workBomlist= workOrderService.getWorkBom(id); for (BomEntity bomEntity:workBomlist){ - QueryWrapper bomEntityQueryWrapper = new QueryWrapper<>(); - bomEntityQueryWrapper.lambda().eq(BomItemValueEntity::getBomId,bomEntity.getId()); - List bomItemValueEntityList = bomItemValueService.list(bomEntityQueryWrapper); - bomEntity.setBomItemValueEntityList(bomItemValueEntityList); - - List productList =new ArrayList<>(); - for (BomItemValueEntity bomItemValueEntity : bomItemValueEntityList){ - List productWarehouseEntityList=workOrderService.getWorkBomProduct(bomItemValueEntity.getProductId()); - productList.addAll(productWarehouseEntityList); - } - bomEntity.setProductWarehouseEntityList(productList); +// QueryWrapper bomEntityQueryWrapper = new QueryWrapper<>(); +// bomEntityQueryWrapper.lambda().eq(BomItemValueEntity::getBomId,bomEntity.getId()); +// List bomItemValueEntityList = bomItemValueService.list(bomEntityQueryWrapper); +// bomEntity.setBomItemValueEntityList(bomItemValueEntityList); +// List productList =new ArrayList<>(); +// for (BomItemValueEntity bomItemValueEntity : bomItemValueEntityList){ +// List productWarehouseEntityList=workOrderService.getWorkBomProduct(bomItemValueEntity.getProductId()); + List productWarehouseEntityList=workOrderService.getWorkBomProduct(bomEntity.getId()); +// productList.addAll(productWarehouseEntityList); +// } +// bomEntity.setProductWarehouseEntityList(productList); + bomEntity.setProductWarehouseEntityList(productWarehouseEntityList); } return ActionResult.success(workBomlist); } + /** + * 编辑状态 + * @param id + * @param workOrderForm + * @return + */ + @PutMapping("/workStatus/{id}") + @Operation(summary = "编辑状态") + public ActionResult updateWorkStatus(@PathVariable("id") String id,@RequestBody @Valid WorkOrderForm workOrderForm, + @RequestParam(value = "isImport", required = false) boolean isImport){ + workOrderForm.setId(id); + WorkOrderEntity entity= workOrderService.getInfo(id); + if(entity!=null){ + try{ + BigDecimal bigworknums; + BigDecimal retNums; + BigDecimal zeros = BigDecimal.ZERO; + QueryWrapper workOrderProductEntityQueryWrapper =new QueryWrapper<>(); + workOrderProductEntityQueryWrapper.lambda().eq(WorkOrderProductEntity::getWorkId, id); + List workOrderProductEntityList = workOrderProductService.list(workOrderProductEntityQueryWrapper); + bigworknums = workOrderProductEntityList.get(0).getProportionNum(); //成品之前加工数 + retNums = new BigDecimal(workOrderForm.getWorkOrderProductList().get(0).getProportionNum()); //成品现在加工数量 + bigworknums = bigworknums.add(retNums); + + List workOrderProductModels =new ArrayList<>(); + for (WorkOrderProductModel workOrderProductModel:workOrderForm.getWorkOrderProductList()){ + //加工数量和计划加工数量对比 + workOrderProductModel.setProportionNum(String.valueOf(bigworknums)); + BigDecimal planNum = new BigDecimal(workOrderProductModel.getPlanNum()); + BigDecimal planNum1 =planNum.subtract(retNums); + + planNum = planNum.subtract(bigworknums); + int result = planNum.compareTo(zeros); + if (result>0){ +// System.out.println("刚好大于0"); +// workOrderForm.setStatus("4"); + }else if (result==0){ +// System.out.println("刚好等于0"); + workOrderForm.setStatus("5"); + } + else { + + return ActionResult.fail("加工数量不能大于计划加工数量，"+"现在已经加工数量是"+planNum1); + } + workOrderProductModels.add(workOrderProductModel); + } + workOrderForm.setWorkOrderProductList(workOrderProductModels); + workOrderService.saveOrUpdateWork(workOrderForm,id,false); + + if (workOrderForm.getType().equals("2")){ + //成品生成入库单 + WarehousingStorageForm warehousingStorageForm=new WarehousingStorageForm(); + warehousingStorageForm.setWarehousingStorageType("14"); + warehousingStorageForm.setWarehousingId(workOrderForm.getId()); + warehousingStorageForm.setWarehouseId(workOrderForm.getWarehouseId()); + List list =new ArrayList<>(); + for (WorkOrderProductModel workOrderProductModel:workOrderForm.getWorkOrderProductList()){ + WarehousingStorageProductModel warehousingStorageProductModel=new WarehousingStorageProductModel(); + warehousingStorageProductModel.setProductId(workOrderProductModel.getProductId()); + warehousingStorageProductModel.setStorageAreaId(workOrderProductModel.getCargoId()); + warehousingStorageProductModel.setStorageUnit(workOrderProductModel.getUnitId()); //加工单位 + warehousingStorageProductModel.setStorageNumber(workOrderProductModel.getProportionNum()); + list.add(warehousingStorageProductModel); + + warehousingStorageForm.setWarehousingStorageProductList(list); + + } + warehousingStorageController.createWork(id,warehousingStorageForm); + //原材料生成领用单和出库单和返库单和报损单 + //领用单 + WarehousingReceiveForm warehousingReceiveForm=new WarehousingReceiveForm(); + warehousingReceiveForm.setWarehouseId(workOrderForm.getWarehouseId()); //仓库 + warehousingReceiveForm.setUsedreturnStatus("4"); + warehousingReceiveForm.setUsedreturnReason("8"); + warehousingReceiveForm.setBusinessId(workOrderForm.getId()); //关联单据 加工单 + warehousingReceiveForm.setRemark(workOrderForm.getRemark()); + List warehousingReceiveList =new ArrayList<>(); + String unit=workOrderForm.getWorkOrderProductList().get(0).getUnitId(); + for (WorkOrderPrimaryModel WorkOrderPrimaryModel:workOrderForm.getWorkOrderPrimaryList()){ + WarehousingReceiveProductModel warehousingReceiveProductModel=new WarehousingReceiveProductModel(); + warehousingReceiveProductModel.setProductId(WorkOrderPrimaryModel.getProductId()); + warehousingReceiveProductModel.setCargoId(WorkOrderPrimaryModel.getCargoId()); + warehousingReceiveProductModel.setUsedreturnUnit(unit); //加工单位 + warehousingReceiveProductModel.setUsedreturnNumber(WorkOrderPrimaryModel.getRealityNum()); //实际发货量 + warehousingReceiveList.add(warehousingReceiveProductModel); + + warehousingReceiveForm.setWarehousingReceiveProductList(warehousingReceiveList); + } + warehousingReceiveController.createWorkOrder(id,warehousingReceiveForm); + //出库单 + WarehousingOutboundForm warehousingOutboundForm=new WarehousingOutboundForm(); +// WarehousingReceiveEntity receiveentity= warehousingReceiveService.getInfo(warehousingOutboundForm.getId()); + QueryWrapper receiveWrapper = new QueryWrapper<>(); + receiveWrapper.lambda().eq(WarehousingReceiveEntity::getBusinessId, id); +// flowTaskNodeEntityQueryWrapper.lambda().eq(WarehousingReceiveEntity::getTaskId, flowTaskEntity.getId()); + List warehousingReceiveEntityList = warehousingReceiveService.list(receiveWrapper); + warehousingOutboundForm.setWarehousingOutboundType("14"); + warehousingOutboundForm.setWarehousingId(warehousingReceiveEntityList.get(0).getId()); + warehousingOutboundForm.setWarehouseId(warehousingReceiveForm.getWarehouseId()); + List warehousingOutboundProductModelList =new ArrayList<>(); + for (WarehousingReceiveProductModel warehousingReceiveProductModel1:warehousingReceiveList){ + WarehousingOutboundProductModel warehousingOutboundProductModel=new WarehousingOutboundProductModel(); + warehousingOutboundProductModel.setProductId(warehousingReceiveProductModel1.getProductId()); + warehousingOutboundProductModel.setOutboundAreaId(warehousingReceiveProductModel1.getCargoId()); + warehousingOutboundProductModel.setOutboundUnit(unit); //加工单位 + warehousingOutboundProductModel.setOutboundNumber(warehousingReceiveProductModel1.getUsedreturnNumber()); //实际发货量 + warehousingOutboundProductModelList.add(warehousingOutboundProductModel); + warehousingOutboundForm.setWarehousingOutboundProductList(warehousingOutboundProductModelList); + } + warehousingOutboundController.createWork(id,warehousingOutboundForm); + //返库单 + WarehousingReturnForm warehousingReturnForm=new WarehousingReturnForm(); + warehousingReturnForm.setBusinessId(workOrderForm.getId()); + warehousingReturnForm.setWarehouseId(workOrderForm.getWarehouseId()); + warehousingReturnForm.setReturnReason("8"); + warehousingReturnForm.setRemark(workOrderForm.getRemark()); + BigDecimal retNum = new BigDecimal("0"); + BigDecimal zero = BigDecimal.ZERO; + List warehousingReturnProductModelList =new ArrayList<>(); + for (WorkOrderPrimaryModel WorkOrderPrimaryModel:workOrderForm.getWorkOrderPrimaryList()){ + if (WorkOrderPrimaryModel.getReturnNum()==null||WorkOrderPrimaryModel.getReturnNum().equals("0")){ + }else{ + WarehousingReturnProductModel warehousingReturnProductModel=new WarehousingReturnProductModel(); + warehousingReturnProductModel.setProductId(WorkOrderPrimaryModel.getProductId()); + warehousingReturnProductModel.setReturnUnit(unit); + warehousingReturnProductModel.setCargoId(WorkOrderPrimaryModel.getCargoId()); + warehousingReturnProductModel.setReturnNumber(WorkOrderPrimaryModel.getReturnNum()); + warehousingReturnProductModelList.add(warehousingReturnProductModel); + warehousingReturnForm.setWarehousingReturnProductList(warehousingReturnProductModelList); + retNum =new BigDecimal(WorkOrderPrimaryModel.getReturnNum()); + } + } + if (retNum.compareTo(zero)>0){ + warehousingReturnController.createWork(id,warehousingReturnForm); + } + //报损单 + WarehousingReportlossForm warehousingReportlossForm=new WarehousingReportlossForm(); + warehousingReportlossForm.setReportlossType("4"); + warehousingReportlossForm.setReportlossReason("5"); + warehousingReportlossForm.setWarehouseId(workOrderForm.getWarehouseId()); + warehousingReportlossForm.setBusinessId(workOrderForm.getId()); + warehousingReportlossForm.setRemark(workOrderForm.getRemark()); + BigDecimal retNum1 = new BigDecimal("0"); + BigDecimal zero1 = BigDecimal.ZERO; + List warehousingReportlossProductModelList =new ArrayList<>(); + for (WorkOrderPrimaryModel WorkOrderPrimaryModel:workOrderForm.getWorkOrderPrimaryList()){ + if (WorkOrderPrimaryModel.getReportlossNum()==null||WorkOrderPrimaryModel.getReportlossNum().equals("0")){ + }else{ + WarehousingReportlossProductModel warehousingReportlossProductModel=new WarehousingReportlossProductModel(); + warehousingReportlossProductModel.setProductId(WorkOrderPrimaryModel.getProductId()); + warehousingReportlossProductModel.setReportlossUnit(unit); + warehousingReportlossProductModel.setCargoId(WorkOrderPrimaryModel.getCargoId()); + warehousingReportlossProductModel.setReportlossNumber(WorkOrderPrimaryModel.getReportlossNum()); + warehousingReportlossProductModelList.add(warehousingReportlossProductModel); + warehousingReportlossForm.setWarehousingReportlossProductList(warehousingReportlossProductModelList); + retNum1 =new BigDecimal(WorkOrderPrimaryModel.getReportlossNum()); + } + } + if (retNum1.compareTo(zero1)>0){ + warehousingReportlossController.createWork(id,warehousingReportlossForm); + } + + } + + + + }catch(Exception e){ + return ActionResult.fail("修改数据失败"); + } + return ActionResult.success("更新成功"); + }else{ + return ActionResult.fail("更新失败，数据不存在"); + } + } + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java index dbecb3d7..c51482db 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java @@ -245,6 +245,8 @@ public class ProductWarehouseEntity { @TableField(exist = false) private String salesMainUnitIds; @TableField(exist = false) + private String theoryNum; + @TableField(exist = false) private String inventoryUnitIds; @TableField(exist = false) private String operateUnitIds; @@ -265,4 +267,9 @@ public class ProductWarehouseEntity { private String salesOrderMultiples; @TableField(exist = false) private String productId; + + @TableField(exist = false) + private String productTypeIds; + @TableField(exist = false) + private String inventoryTypes; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossEntity.java index f55f31be..cf53eb7f 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossEntity.java @@ -58,6 +58,9 @@ public class WarehousingReportlossEntity { @TableField("F_VERSION") private Integer version; + @TableField(value = "BUSINESS_ID" , updateStrategy = FieldStrategy.IGNORED) + private String businessId; + @TableField(exist = false) private String reportlossSum; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderPrimaryEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderPrimaryEntity.java index a713450a..50cbc032 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderPrimaryEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderPrimaryEntity.java @@ -51,4 +51,10 @@ public class WorkOrderPrimaryEntity { @TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED) private String cargoId; + + @TableField(value = "RETURN_NUM" , updateStrategy = FieldStrategy.IGNORED) + private BigDecimal returnNum; + @TableField(value = "REPORTLOSS_NUM" , updateStrategy = FieldStrategy.IGNORED) + private BigDecimal reportlossNum; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java index e6ac851c..cbb19716 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java @@ -56,4 +56,10 @@ public class WorkOrderProductEntity { @TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED) private String cargoId; + + @TableField(value = "PLAN_NUM" , updateStrategy = FieldStrategy.IGNORED) + private BigDecimal planNum; + + @TableField(exist = false) + private BigDecimal nums; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingreportloss/WarehousingReportlossForm.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingreportloss/WarehousingReportlossForm.java index 5d96d362..8af18aed 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingreportloss/WarehousingReportlossForm.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingreportloss/WarehousingReportlossForm.java @@ -44,4 +44,7 @@ public class WarehousingReportlossForm { /** 备注 **/ @JsonProperty("remark") private String remark; + /** 关联单据 **/ + @JsonProperty("businessId") + private String businessId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderPrimaryModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderPrimaryModel.java index 16afc464..9ee86c40 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderPrimaryModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderPrimaryModel.java @@ -1,5 +1,7 @@ package jnpf.model.workorder; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.List; import java.util.Date; @@ -30,4 +32,12 @@ public class WorkOrderPrimaryModel { @JSONField(name = "cargoId") private String cargoId; + + /** 原料返库数量 **/ + @JSONField(name = "returnNum") + private String returnNum; + /** 原料报损数量 **/ + @JSONField(name = "reportlossNum") + private String reportlossNum; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderProductModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderProductModel.java index 21185a16..fd2488eb 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderProductModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderProductModel.java @@ -1,5 +1,7 @@ package jnpf.model.workorder; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.List; import java.util.Date; @@ -39,4 +41,7 @@ public class WorkOrderProductModel { @JSONField(name = "cargoId") private String cargoId; + + @JSONField(name = "planNum") + private String planNum; } diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/BomProductGoodsBox.vue b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/BomProductGoodsBox.vue index e6a603e2..64d1c371 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/BomProductGoodsBox.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/BomProductGoodsBox.vue @@ -1,16 +1,18 @@