From 2c3b51a13984014d510aba73a53ff46401756905 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 14 Mar 2024 18:00:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E8=BD=AC=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionParcelListServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index 87d9685ed..736c7f3df 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -868,6 +868,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl>>>>>>>,{}",distributionStockListEntity); distributionStockListService.save(distributionStockListEntity); } // distributionStockListEntity.setTrayName(Optional.ofNullable(distributionParcelList.getPallet()).orElse(null)); //托盘 From aab70e2376a6b3ea96be52b325aa718dee5ef9c6 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 14 Mar 2024 18:35:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9B=B6=E6=8B=85?= =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WarehouseWaybillServiceImpl.java | 294 +++++++++--------- 1 file changed, 150 insertions(+), 144 deletions(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index 70e0ffe26..e7afc69df 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -163,162 +163,168 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl details = warehouseWayBillDetailService.findByWaybillId(waybillId); - StringBuilder sb = new StringBuilder(); - for (WarehouseWayBillDetail warehouseWayBillDetail : details) { - if (!sb.toString().isEmpty()) { - sb.append(","); + distributionStockArticleEntity.setCustomerName(warehouseWaybill.getConsigneeName()); + distributionStockArticleEntity.setCustomerTelephone(warehouseWaybill.getConsigneeMobile()); + distributionStockArticleEntity.setCustomerAddress(warehouseWaybill.getConsigneeAddress()); + distributionStockArticleEntity.setGenre(1); + distributionStockArticleEntity.setCreateUser(1123598821738675201L); + distributionStockArticleEntity.setUpdateUser(1123598821738675201L); + distributionStockArticleEntity.setSortingQuantity(0); //分拣件数 + distributionStockArticleEntity.setDeliveryQuantity(0); //配送件数 + distributionStockArticleEntity.setTransferQuantity(0); //中转件数 + distributionStockArticleEntity.setSigninQuantity(0); //签收件数 + distributionStockArticleEntity.setFreezeStatus(OrderFreezeStatusConstant.weidongjie.getValue()); //冻结状态 + distributionStockArticleEntity.setReservationStatus(OrderReservationStatusConstant.daiyuyue.getValue()); //预约状态 + distributionStockArticleEntity.setStockupStatus(OrderStockupStatusConstant.daibeihuo.getValue()); //备货状态 + distributionStockArticleEntity.setGroundingStatus(OrderGroundingStatusConstant.daishangjia.getValue()); //上架状态 + distributionStockArticleEntity.setOrderStatus(OrderStatusConstant.bufenruku.getValue()); + distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.bufenshouhuo.getValue()); + checkStatus(distributionStockArticleEntity); + + distributionStockArticleEntity.setConsigneeUnit(customerName);//收货单位（经销商） + distributionStockArticleEntity.setConsigneePerson(warehouseWaybill.getConsigneeName());//收货人 + distributionStockArticleEntity.setConsigneeMobile(warehouseWaybill.getConsigneeMobile()); + distributionStockArticleEntity.setConsigneeAddress(warehouseWaybill.getConsigneeAddress()); + distributionStockArticleEntity.setWarehouseEntryTimeEnd(date); + distributionStockArticleEntity.setSendWarehouseId(warehouseWaybill.getDepartureWarehouseId()); + distributionStockArticleEntity.setSendWarehouseName(warehouseWaybill.getDepartureWarehouseName()); + distributionStockArticleEntity.setAcceptWarehouseId(warehouseWaybill.getDestinationWarehouseId()); + distributionStockArticleEntity.setAcceptWarehouseName(warehouseWaybill.getDestinationWarehouseName()); + distributionStockArticleEntity.setIsZero("1"); + distributionStockArticleEntity.setIncomingNum(allNum); + distributionStockArticleEntity.setTenantId(TenantNum.HUITONGCODE); + + List details = warehouseWayBillDetailService.findByWaybillId(waybillId); + StringBuilder sb = new StringBuilder(); + for (WarehouseWayBillDetail warehouseWayBillDetail : details) { + if (!sb.toString().isEmpty()) { + sb.append(","); + } + sb.append(warehouseWayBillDetail.getProductName()); } - sb.append(warehouseWayBillDetail.getProductName()); - } - distributionStockArticleEntity.setDescriptionGoods(sb.toString()); + distributionStockArticleEntity.setDescriptionGoods(sb.toString()); - id = distributionStockArticleClient.addData(distributionStockArticleEntity); - if (id == 0) { - log.warn("#################createStockArticle: 保存订单信息失败 orderSelfNum={}", waybillNo); - throw new CustomerException(405, "保存订单信息失败"); - } + id = distributionStockArticleClient.addData(distributionStockArticleEntity); + if (id == 0) { + log.warn("#################createStockArticle: 保存订单信息失败 orderSelfNum={}", waybillNo); + throw new CustomerException(405, "保存订单信息失败"); + } - //第一次生成订单也要生成包件信息 - List parcelNumberList = new ArrayList<>(); - for (WarehouseWayBillDetail warehouseWayBillDetail : details) { - DistributionParcelListEntity entity = new DistributionParcelListEntity(); - entity.setFirsts(warehouseWayBillDetail.getProductName()); - entity.setTenantId("627683"); - entity.setCreateUser(distributionStockArticleEntity.getCreateUser()); - entity.setUpdateUser(distributionStockArticleEntity.getCreateUser()); - entity.setCreateDept(distributionStockArticleEntity.getCreateDept()); - entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId()); - entity.setWarehouse(distributionStockArticleEntity.getWarehouse()); - entity.setQuantity(warehouseWayBillDetail.getNum()); - entity.setConditions(1); - entity.setStockArticleId(id); - entity.setOrderCode(distributionStockArticleEntity.getOrderCode()); - entity.setOrderPackageStatus("20"); - entity.setOrderPackageFreezeStatus("10"); - entity.setOrderPackageGroundingStatus("10"); - entity.setOrderPackageStockupStatus("10"); - entity.setOrderPackageReservationStatus("10"); - entity.setOrderPackageLoadingStatus("10"); - entity.setWaybillNumber(distributionStockArticleEntity.getWaybillNumber()); - entity.setWarehouseEntryTimeEnd(date); - entity.setSendWarehouseId(warehouseWaybill.getDepartureWarehouseId()); - entity.setSendWarehouseName(warehouseWaybill.getDepartureWarehouseName()); - entity.setAcceptWarehouseId(warehouseWaybill.getDestinationWarehouseId()); - entity.setAcceptWarehouseName(warehouseWaybill.getDestinationWarehouseName()); - Long aLong = distributionParcelListClient.addReturnId(entity); - - DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity(); - parcelNumberEntity.setStockArticleId(id); - parcelNumberEntity.setParcelListId(aLong); - parcelNumberEntity.setTenantId("627683"); - parcelNumberEntity.setCreateUser(distributionStockArticleEntity.getCreateUser()); - parcelNumberEntity.setUpdateUser(distributionStockArticleEntity.getCreateUser()); - parcelNumberEntity.setCreateDept(distributionStockArticleEntity.getCreateDept()); - parcelNumberEntity.setHandQuantity(0); - parcelNumberEntity.setQuantity(entity.getQuantity()); - parcelNumberEntity.setDeliveryQuantity(0); - parcelNumberEntity.setSigninQuantity(0); - parcelNumberEntity.setOutboundQuantity(0); - parcelNumberList.add(parcelNumberEntity); + //第一次生成订单也要生成包件信息 + List parcelNumberList = new ArrayList<>(); + for (WarehouseWayBillDetail warehouseWayBillDetail : details) { + DistributionParcelListEntity entity = new DistributionParcelListEntity(); + entity.setFirsts(warehouseWayBillDetail.getProductName()); + entity.setTenantId("627683"); + entity.setCreateUser(distributionStockArticleEntity.getCreateUser()); + entity.setUpdateUser(distributionStockArticleEntity.getCreateUser()); + entity.setCreateDept(distributionStockArticleEntity.getCreateDept()); + entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId()); + entity.setWarehouse(distributionStockArticleEntity.getWarehouse()); + entity.setQuantity(warehouseWayBillDetail.getNum()); + entity.setConditions(1); + entity.setStockArticleId(id); + entity.setOrderCode(distributionStockArticleEntity.getOrderCode()); + entity.setOrderPackageStatus("20"); + entity.setOrderPackageFreezeStatus("10"); + entity.setOrderPackageGroundingStatus("10"); + entity.setOrderPackageStockupStatus("10"); + entity.setOrderPackageReservationStatus("10"); + entity.setOrderPackageLoadingStatus("10"); + entity.setWaybillNumber(distributionStockArticleEntity.getWaybillNumber()); + entity.setWarehouseEntryTimeEnd(date); + entity.setSendWarehouseId(warehouseWaybill.getDepartureWarehouseId()); + entity.setSendWarehouseName(warehouseWaybill.getDepartureWarehouseName()); + entity.setAcceptWarehouseId(warehouseWaybill.getDestinationWarehouseId()); + entity.setAcceptWarehouseName(warehouseWaybill.getDestinationWarehouseName()); + Long aLong = distributionParcelListClient.addReturnId(entity); - } - //存入零担订单包件数量 - distributionParcelNumberClient.addBatch(parcelNumberList); + DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity(); + parcelNumberEntity.setStockArticleId(id); + parcelNumberEntity.setParcelListId(aLong); + parcelNumberEntity.setTenantId("627683"); + parcelNumberEntity.setCreateUser(distributionStockArticleEntity.getCreateUser()); + parcelNumberEntity.setUpdateUser(distributionStockArticleEntity.getCreateUser()); + parcelNumberEntity.setCreateDept(distributionStockArticleEntity.getCreateDept()); + parcelNumberEntity.setHandQuantity(0); + parcelNumberEntity.setQuantity(entity.getQuantity()); + parcelNumberEntity.setDeliveryQuantity(0); + parcelNumberEntity.setSigninQuantity(0); + parcelNumberEntity.setOutboundQuantity(0); + parcelNumberList.add(parcelNumberEntity); + + } + //存入零担订单包件数量 + distributionParcelNumberClient.addBatch(parcelNumberList); - } else { + } else { - id = distributionStockArticleEntity.getId(); - Integer handQuantity = distributionStockArticleEntity.getHandQuantity(); - distributionStockArticleEntity.setTotalNumber(totalCount); - distributionStockArticleEntity.setHandQuantity(handQuantity+allNum); - distributionStockArticleEntity.setWarehouseEntryTimeEnd(date); - log.info(">>>> 更新订单"); - checkStatus(distributionStockArticleEntity); - distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity); + id = distributionStockArticleEntity.getId(); + Integer handQuantity = distributionStockArticleEntity.getHandQuantity(); + distributionStockArticleEntity.setTotalNumber(totalCount); + distributionStockArticleEntity.setHandQuantity(handQuantity+allNum); + distributionStockArticleEntity.setWarehouseEntryTimeEnd(date); + log.info(">>>> 更新订单"); + checkStatus(distributionStockArticleEntity); + distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity); + } + }catch (Exception e){ + log.error(">>>>> createStockArticle",e); } + //存入包件信息 // List details = warehouseWayBillDetailService.findByWaybillId(waybillId); // From 2f1b36dec5f5a04cc6b14a08ac0f1e254d1211b4 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 14 Mar 2024 18:38:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E6=8E=A8=E9=80=81=E9=9B=B6=E6=8B=85?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=BB=E8=BE=91=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/trunkline/service/impl/OpenOrderServiceImpl.java | 6 ++++-- .../service/impl/WarehouseWaybillServiceImpl.java | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index aa8bffdb6..de53a9fee 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -915,6 +915,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntity.setWaybillStatus("0"); advanceEntity.setFreezeStatus("0"); advanceEntity.setLegacyStatus("0"); + advanceEntity.setCreateUserName(AuthUtil.getNickName()); advanceService.save(advanceEntity); Long advanceId = advanceEntity.getId(); @@ -1019,6 +1020,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntity.setWaybillStatus("0"); advanceEntity.setFreezeStatus("0"); advanceEntity.setLegacyStatus("0"); + advanceEntity.setCreateUserName(AuthUtil.getNickName()); advanceService.save(advanceEntity); }else{ Long advanceId = advanceEntity.getId(); @@ -1150,7 +1152,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { trunklineAdvanceEntity.setFreezeStatus("0"); trunklineAdvanceEntity.setLegacyStatus("0"); trunklineAdvanceEntity.setDeliveryDate(CommonUtil.StringToDate(importCustomizedOuPaiDTO.getDueDateStr())); - trunklineAdvanceEntity.setCreateUserName(AuthUtil.getUserName()); + trunklineAdvanceEntity.setCreateUserName(AuthUtil.getNickName()); advanceService.save(trunklineAdvanceEntity); }else{ Long advanceId = trunklineAdvanceEntity.getId(); @@ -1260,7 +1262,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { trunklineAdvanceEntity.setFreezeStatus("0"); trunklineAdvanceEntity.setLegacyStatus("0"); trunklineAdvanceEntity.setDeliveryDate(CommonUtil.StringToDate(importStandardOuPaiDTO.getDueDateStr())); - trunklineAdvanceEntity.setCreateUserName(AuthUtil.getUserName()); + trunklineAdvanceEntity.setCreateUserName(AuthUtil.getNickName()); advanceService.save(trunklineAdvanceEntity); }else{ Long advanceId = trunklineAdvanceEntity.getId(); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index e7afc69df..08eb59e97 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -188,8 +188,11 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl