From 7e69bf59ba4d194a46271db65a131cd74633b3af Mon Sep 17 00:00:00 2001 From: vayne Date: Tue, 16 Apr 2024 22:03:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=94=80=E5=94=AE=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/scm/BusinessLineMapper.xml | 4 + .../mapper/scm/BusinessOrderMapper.xml | 47 + .../mapper/scm/ReturnCargoOrderMapper.xml | 17 +- .../java/jnpf/mapper/BusinessOrderMapper.java | 1 + .../jnpf/service/BusinessOrderService.java | 2 + .../impl/BusinessOrderServiceImpl.java | 7 + .../impl/WarehousingOutboundServiceImpl.java | 142 ++- .../impl/WarehousingStorageServiceImpl.java | 58 ++ .../controller/BusinessLineController.java | 10 + .../controller/BusinessOrderController.java | 77 +- .../ProductWarehouseController.java | 2 +- .../java/jnpf/entity/BusinessLineEntity.java | 4 + .../jnpf/entity/ReturnCargoOrderEntity.java | 4 + .../src/components/Jnpf/PopupSelect/index.vue | 65 +- .../src/views/scm/businessLine/form.vue | 5 +- .../src/views/scm/businessLine/index.vue | 2 +- .../src/views/scm/businessOrganize/index.vue | 18 +- .../scm/publicPopup/ProductByContractBox.vue | 36 +- .../scm/purchaseCenter/deliveryOrder/form.vue | 2 +- .../purchaseCenter/deliveryVoucher/form.vue | 59 +- .../purchaseInBoundNotice/form.vue | 2 +- .../scm/purchaseCenter/purchaseOrder/form.vue | 15 +- .../scm/purchaseCenter/receiptOrder/form.vue | 30 +- .../purchaseCenter/receiptVoucher/form.vue | 59 +- .../purchaseCenter/returnCargoOrder/form.vue | 2 +- .../scm/saleCenter/deliveryOrder/form.vue | 248 +++-- .../scm/saleCenter/deliveryVoucher/form.vue | 68 +- .../scm/saleCenter/receiptVoucher/form.vue | 59 +- .../views/scm/saleCenter/saleOrder/form.vue | 7 +- .../views/scm/saleCenter/saleOrder/index.vue | 3 +- .../saleCenter/saleOutBoundNotice/form.vue | 879 ++++++++++-------- 31 files changed, 1256 insertions(+), 678 deletions(-) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessLineMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessLineMapper.xml index 8399141e..a7246181 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessLineMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessLineMapper.xml @@ -98,6 +98,8 @@ END AS status1, c.F_Full_Name AS businessLineType, d.F_Full_Name AS businessOrganizeType, + g.F_Full_Name AS workShopType, + f.F_Full_Name AS productionType, i.f_real_name AS belongUserName, e.f_status AS flowStatus FROM @@ -106,6 +108,8 @@ AND i.f_delete_mark IS NULL LEFT JOIN ( SELECT * FROM base_dictionary_data WHERE f_dictionary_type_id = '517662753159119813' ) c ON a.type = c.f_id LEFT JOIN ( SELECT * FROM base_dictionary_data WHERE f_dictionary_type_id = '517958847835407557' ) d ON a.type = d.f_id + LEFT JOIN ( SELECT * FROM base_dictionary_data WHERE f_dictionary_type_id = '521639387734218757' ) g ON a.type = g.f_id + LEFT JOIN ( SELECT * FROM base_dictionary_data WHERE f_dictionary_type_id = '521639458429212677' ) f ON a.type = f.f_id LEFT JOIN flow_task e ON a.id = e.f_process_id ${ew.customSqlSegment} diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml index be62e0d1..ec26a5b5 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml @@ -709,4 +709,51 @@ LEFT JOIN jg_contract c ON a.contract_id = c.id AND c.f_delete_mark is NULL ${ew.customSqlSegment} + + diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ReturnCargoOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ReturnCargoOrderMapper.xml index f675baf5..54be2ef5 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ReturnCargoOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ReturnCargoOrderMapper.xml @@ -299,6 +299,19 @@ diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java index ec3c5d42..2cdaf18b 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java @@ -47,6 +47,7 @@ public interface BusinessOrderMapper extends BaseMapper { List orderByVoucher(@Param("voucherIds") List voucherIds); List purchaseOrderByReceiptOrder(@Param("ew") QueryWrapper queryWrapper); + List saleOrderByDeliveryOrder(@Param("ew") QueryWrapper queryWrapper); BigDecimal queryOccupyInventory(@Param("inventoryEntity") InventoryEntity entity); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java index 21963bde..ce71145d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java @@ -70,6 +70,8 @@ public interface BusinessOrderService extends IService { //采购收货单中的采购订单列表 List purchaseOrderByReceiptOrderInfo(QueryWrapper queryWrapper); + //销售发货单中的销售订单列表 + List saleOrderByDeliveryOrderInfo(QueryWrapper queryWrapper); BigDecimal queryOccupyInventory(InventoryEntity entity); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java index d20f1630..ee7e06fd 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java @@ -849,6 +849,11 @@ public class BusinessOrderServiceImpl extends ServiceImpl saleOrderByDeliveryOrderInfo(QueryWrapper queryWrapper) { + return businessOrderMapper.saleOrderByDeliveryOrder(queryWrapper); + } + @Override public BusinessOrderEntity getInfo(String id){ QueryWrapper queryWrapper=new QueryWrapper<>(); @@ -963,6 +968,7 @@ public class BusinessOrderServiceImpl extends ServiceImpl getList(WarehousingOutboundPagination warehousingOutboundPagination){ return getTypeList(warehousingOutboundPagination,warehousingOutboundPagination.getDataType()); @@ -643,6 +651,7 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl inventoryQueryWrapper = new QueryWrapper<>(); + inventoryQueryWrapper.lambda().eq(InventoryEntity::getProductId, entitys.getProductId()); + inventoryQueryWrapper.lambda().eq(InventoryEntity::getBatchNumber, entitys.getBatchNo()); + List inventoryList = inventoryService.list(inventoryQueryWrapper); + InventoryEntity inventoryEntity = new InventoryEntity(); + if(inventoryList != null && inventoryList.size() > 0){ + inventoryEntity = inventoryList.get(0); + inventoryEntity.setInventoryNumber(inventoryEntity.getInventoryNumber().subtract((entitys.getDeliveryNum())));//库存数量 + }else{ + inventoryEntity.setProductId(entitys.getProductId()); + inventoryEntity.setCode(productWarehouseEntity.getCode()); + inventoryEntity.setName(productWarehouseEntity.getName()); + inventoryEntity.setPhoto(productWarehouseEntity.getPhoto()); + inventoryEntity.setBrandId(productWarehouseEntity.getBrandId()); + inventoryEntity.setProductTypeId(productWarehouseEntity.getProductTypeId()); + inventoryEntity.setSpec(productWarehouseEntity.getSpec()); + inventoryEntity.setInventoryUnitId(productWarehouseEntity.getInventoryUnitId()); + inventoryEntity.setWarehouseId(entity.getWarehouseId()); + inventoryEntity.setStorageAreaId(entitys.getCargoId()); + inventoryEntity.setBatchNumber(entitys.getBatchNo()); + inventoryEntity.setInventoryNumber((entitys.getDeliveryNum()));//库存数量 + //inventoryEntity.setPurchasePrice();//平均采购单价 + //inventoryEntity.setTotalCost();//总成本 + } + inventoryService.saveOrUpdate(inventoryEntity); + + //更新库存流水 + InventoryLogEntity inventoryLogEntity = new InventoryLogEntity(); + inventoryLogEntity.setProductId(entitys.getProductId()); + inventoryLogEntity.setBusinessNo(entity.getDocumentNo()); + if (deliveryType.equals("1")){ + inventoryLogEntity.setBusinessType("26");//采购发货单出库 + }else if (deliveryType.equals("2")) { + inventoryLogEntity.setBusinessType("27");//销售发货单出库 + } + inventoryLogEntity.setCode(productWarehouseEntity.getCode()); + inventoryLogEntity.setName(productWarehouseEntity.getName()); + inventoryLogEntity.setPhoto(productWarehouseEntity.getPhoto()); + inventoryLogEntity.setBrandId(productWarehouseEntity.getBrandId()); + inventoryLogEntity.setProductTypeId(productWarehouseEntity.getProductTypeId()); + inventoryLogEntity.setSpec(productWarehouseEntity.getSpec()); + inventoryLogEntity.setInventoryUnitId(productWarehouseEntity.getInventoryUnitId()); + inventoryLogEntity.setWarehouseId(entity.getWarehouseId()); + inventoryLogEntity.setStorageAreaId(entitys.getCargoId()); + inventoryLogEntity.setBatchNumber(entitys.getBatchNo()); + inventoryLogEntity.setChangeNumber((entitys.getDeliveryNum())); + inventoryLogEntity.setInventoryNumber((inventoryEntity.getInventoryNumber()));//库存数量 + inventoryLogService.saveOrUpdate(inventoryLogEntity); } //更新发货单中的发货数量和发货时间 DeliveryOrderEntity deliveryOrderEntity = deliveryOrderService.getInfo(deliveryOrderForm.getId()); @@ -691,26 +761,51 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl tableField114 = JsonUtil.getJsonToList(deliveryOrderForm.getDeliveryVoucherRelationList(),WarehousingOutboundPoundlistEntity.class); for(WarehousingOutboundPoundlistEntity entitys : tableField114){ entitys.setId(RandomUtil.uuId()); - entitys.setDocumentType("2"); - entitys.setBusinessType("1"); + if (deliveryType.equals("1")) { + entitys.setDocumentType("2"); + entitys.setBusinessType("1"); + }else if (deliveryType.equals("2")){ + entitys.setDocumentType("2"); + entitys.setBusinessType("2"); + } entitys.setWarehousingOutboundId(entity.getId()); // //将商品子表id放入凭证子表 // QueryWrapper productQueryWrapper = new QueryWrapper<>(); 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 6feddfa0..b01291be 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 @@ -69,6 +69,12 @@ public class WarehousingStorageServiceImpl extends ServiceImpl getList(WarehousingStoragePagination warehousingStoragePagination){ return getTypeList(warehousingStoragePagination,warehousingStoragePagination.getDataType()); @@ -715,6 +721,58 @@ public class WarehousingStorageServiceImpl extends ServiceImpl inventoryQueryWrapper = new QueryWrapper<>(); + inventoryQueryWrapper.lambda().eq(InventoryEntity::getProductId, entitys.getProductId()); + inventoryQueryWrapper.lambda().eq(InventoryEntity::getBatchNumber, entitys.getBatchNo()); + List inventoryList = inventoryService.list(inventoryQueryWrapper); + InventoryEntity inventoryEntity = new InventoryEntity(); + if(inventoryList != null && inventoryList.size() > 0){ + inventoryEntity = inventoryList.get(0); + inventoryEntity.setInventoryNumber(inventoryEntity.getInventoryNumber().add((entitys.getDeliveryNum())));//库存数量 + }else{ + inventoryEntity.setProductId(entitys.getProductId()); + inventoryEntity.setCode(productWarehouseEntity.getCode()); + inventoryEntity.setName(productWarehouseEntity.getName()); + inventoryEntity.setPhoto(productWarehouseEntity.getPhoto()); + inventoryEntity.setBrandId(productWarehouseEntity.getBrandId()); + inventoryEntity.setProductTypeId(productWarehouseEntity.getProductTypeId()); + inventoryEntity.setSpec(productWarehouseEntity.getSpec()); + inventoryEntity.setInventoryUnitId(productWarehouseEntity.getInventoryUnitId()); + inventoryEntity.setWarehouseId(entity.getWarehouseId()); + inventoryEntity.setStorageAreaId(entitys.getCargoId()); + inventoryEntity.setBatchNumber(entitys.getBatchNo()); + inventoryEntity.setInventoryNumber((entitys.getDeliveryNum()));//库存数量 + //inventoryEntity.setPurchasePrice();//平均采购单价 + //inventoryEntity.setTotalCost();//总成本 + } + inventoryService.saveOrUpdate(inventoryEntity); + + //更新库存流水 + InventoryLogEntity inventoryLogEntity = new InventoryLogEntity(); + inventoryLogEntity.setProductId(entitys.getProductId()); + inventoryLogEntity.setBusinessNo(entity.getDocumentNo()); + inventoryLogEntity.setBusinessType("18");//采购收货单入库 + inventoryLogEntity.setCode(productWarehouseEntity.getCode()); + inventoryLogEntity.setName(productWarehouseEntity.getName()); + inventoryLogEntity.setPhoto(productWarehouseEntity.getPhoto()); + inventoryLogEntity.setBrandId(productWarehouseEntity.getBrandId()); + inventoryLogEntity.setProductTypeId(productWarehouseEntity.getProductTypeId()); + inventoryLogEntity.setSpec(productWarehouseEntity.getSpec()); + inventoryLogEntity.setInventoryUnitId(productWarehouseEntity.getInventoryUnitId()); + inventoryLogEntity.setWarehouseId(entity.getWarehouseId()); + inventoryLogEntity.setStorageAreaId(entitys.getCargoId()); + inventoryLogEntity.setBatchNumber(entitys.getBatchNo()); + inventoryLogEntity.setChangeNumber((entitys.getDeliveryNum())); + inventoryLogEntity.setInventoryNumber((inventoryEntity.getInventoryNumber()));//库存数量 + inventoryLogService.saveOrUpdate(inventoryLogEntity); } //更新收货单中的收货数量和收货时间 ReceiptOrderEntity receiptOrderEntity = receiptOrderService.getInfo(receiptOrderForm.getId()); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLineController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLineController.java index ef6cfb1c..2a823f57 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLineController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLineController.java @@ -143,6 +143,16 @@ public class BusinessLineController { } //流程状态添加 for(Map vo:realList){ + if (ObjectUtil.isEmpty(vo.get("type")) && vo.get("diffFlag").equals("1")){ + List businessLineEntity = list.stream().filter(e -> e.getId().equals(vo.get("id"))).collect(Collectors.toList()); + vo.put("type",businessLineEntity.get(0).getBusinessLineType()); + }else if (ObjectUtil.isEmpty(vo.get("type")) && vo.get("diffFlag").equals("5")){ + List businessLineEntity = list.stream().filter(e -> e.getId().equals(vo.get("id"))).collect(Collectors.toList()); + vo.put("type",businessLineEntity.get(0).getWorkShopType()); + }else if (ObjectUtil.isEmpty(vo.get("type")) && vo.get("diffFlag").equals("6")){ + List businessLineEntity = list.stream().filter(e -> e.getId().equals(vo.get("id"))).collect(Collectors.toList()); + vo.put("type",businessLineEntity.get(0).getProductionType()); + } FlowTaskEntity flowTaskEntity = generaterSwapUtil.getInfoSubmit(String.valueOf(vo.get("id")), FlowTaskEntity::getStatus); if (flowTaskEntity!=null){ vo.put("flowState",flowTaskEntity.getStatus()); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java index cfceaebf..af19eb69 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java @@ -671,15 +671,18 @@ public class BusinessOrderController { * * @return */ - @Operation(summary = "获取销售订单") + @Operation(summary = "销售发货单中的销售订单列表") @GetMapping("/getSalesOrderList") public ActionResult list()throws IOException{ QueryWrapper businessOrderQueryWrapper=new QueryWrapper<>(); - businessOrderQueryWrapper.lambda().eq(BusinessOrderEntity::getBusinessType, "2");//销售 - businessOrderQueryWrapper.lambda().eq(BusinessOrderEntity::getDeliveryType,"2");//配送方式为直送 - businessOrderQueryWrapper.isNull("f_delete_mark"); - businessOrderQueryWrapper.inSql("id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单 - List businessOrderEntityList = businessOrderService.list(businessOrderQueryWrapper); + businessOrderQueryWrapper.eq("a.business_type", "2");//销售 + businessOrderQueryWrapper.eq("a.delivery_type","2");//配送方式为直送 + businessOrderQueryWrapper.and(wrapper -> + wrapper.eq("a.status","4").or().eq("a.status","5") + ); + businessOrderQueryWrapper.isNull("a.f_delete_mark"); + businessOrderQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单 + List businessOrderEntityList = businessOrderService.saleOrderByDeliveryOrderInfo(businessOrderQueryWrapper); // List> realList=new ArrayList<>(); for (BusinessOrderEntity entity: businessOrderEntityList) { if (StringUtil.isNotEmpty(entity.getSecondSubjectBasicId())){ @@ -888,6 +891,68 @@ public class BusinessOrderController { return ActionResult.success(businessOrderEntity); } + /** + * 出库通知订单列表 + * + * @return + */ + @Operation(summary = "出库通知订单列表") + @GetMapping("/outBoundPurchaseOrderList") + public ActionResult outBoundPurchaseOrderList(@RequestParam("id") String id)throws IOException{ + BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(id); + //二级供应商名字 + if (StringUtil.isNotEmpty(businessOrderEntity.getSecondSubjectBasicId())){ + SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getSecondSubjectBasicId()); + if (subjectbasicEntity != null) { + businessOrderEntity.setSecondSupplyName(subjectbasicEntity.getName()); + } + } + //三级供应商名字 + if (StringUtil.isNotEmpty(businessOrderEntity.getThirdSubjectBasicId())){ + SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getThirdSubjectBasicId()); + if (subjectbasicEntity != null) { + businessOrderEntity.setThirdSupplyName(subjectbasicEntity.getName()); + } + } + //业务线名字 + if (StringUtil.isNotEmpty(businessOrderEntity.getBusinessLineId())){ + BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntity.getBusinessLineId()); + if (businessLineEntity != null){ + businessOrderEntity.setBusinessLineName(businessLineEntity.getName()); + } + } + //结算信息 + List settlementInfoList = businessOrderService.getSettlementInfoList(businessOrderEntity.getId()); + //查询订单下面的商品 + List businessOrderProductRelationalList = businessOrderService.getBusinessOrderProductRelationalList(businessOrderEntity.getId()); + //查询已经生成的入库通知 + List list = warehousingNotificationService.queryInBoundNoticeInfo(businessOrderEntity.getId(),"8"); + if (list != null && list.size()>0) { + //对出库通知中相同的商品进行通知数量合并 + List warehousingProductEntityList = list.stream().collect(Collectors.toMap(s -> s.getProductId()+";"+s.getPurchaseUnitId(), a -> a, (o1, o2) -> { + o1.setNotificationStorageNumber(o1.getNotificationStorageNumber().add(o2.getNotificationStorageNumber())); + return o1; + })).values().stream().collect(Collectors.toList()); + for (int i = 0; i < businessOrderProductRelationalList.size(); i++) { + for (int j = 0; j < warehousingProductEntityList.size(); j++) { + if (businessOrderProductRelationalList.get(i).getProductId().equals(warehousingProductEntityList.get(j).getProductId()) && businessOrderProductRelationalList.get(i).getSalesMainUnitId().equals(warehousingProductEntityList.get(j).getPurchaseUnitId())) { + BigDecimal num = businessOrderProductRelationalList.get(i).getBusinessNum().subtract(warehousingProductEntityList.get(j).getNotificationStorageNumber()); + businessOrderProductRelationalList.get(i).setRemainingStockableQuantity(num); + businessOrderProductRelationalList.get(i).setNotificationStorageNumber(num); + } + } + } + }else{ + for (BusinessOrderProductRelationalEntity businessOrderProductRelationalEntity : businessOrderProductRelationalList){ + businessOrderProductRelationalEntity.setRemainingStockableQuantity(businessOrderProductRelationalEntity.getBusinessNum()); + businessOrderProductRelationalEntity.setNotificationStorageNumber(businessOrderProductRelationalEntity.getBusinessNum()); + } + } + businessOrderEntity.setSettlementInfoList(settlementInfoList); + businessOrderEntity.setBusinessOrderProductRelationalList(businessOrderProductRelationalList); + return ActionResult.success(businessOrderEntity); + } + /** * 列表 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 4af55931..e94c5be1 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 @@ -146,7 +146,7 @@ public class ProductWarehouseController { @PostMapping("/getBomProductlist") public ActionResult bomProductlist(@RequestBody ProductWarehousePagination productWarehousePagination)throws IOException{ List list= productWarehouseService.getProductList(productWarehousePagination); - List> realList=new ArrayList<>(); + List> realList = new ArrayList<>(); for (ProductWarehouseEntity entity : list) { Map productWarehouseMap=JsonUtil.entityToMap(entity); productWarehouseMap.put("id", productWarehouseMap.get("id")); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineEntity.java index 6f41dbb8..14ca1e74 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineEntity.java @@ -144,4 +144,8 @@ public class BusinessLineEntity { private Integer flowStatus; @TableField(exist = false) private String status1; + @TableField(exist = false) + private String workShopType; + @TableField(exist = false) + private String productionType; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReturnCargoOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReturnCargoOrderEntity.java index 08383428..6ecc1254 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReturnCargoOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReturnCargoOrderEntity.java @@ -163,4 +163,8 @@ public class ReturnCargoOrderEntity { private String realName; @TableField(exist = false) private String realNameA; + @TableField(exist = false) + private String documentTypeReturn; + @TableField(exist = false) + private String documentStatusReturn; } diff --git a/jnpf-java-boot/jnpf-web/src/components/Jnpf/PopupSelect/index.vue b/jnpf-java-boot/jnpf-web/src/components/Jnpf/PopupSelect/index.vue index deb74bdc..dc34a642 100644 --- a/jnpf-java-boot/jnpf-web/src/components/Jnpf/PopupSelect/index.vue +++ b/jnpf-java-boot/jnpf-web/src/components/Jnpf/PopupSelect/index.vue @@ -4,20 +4,23 @@