From 4e44b0fb9f5f04d3456f9f189be5ccf4b8f6f904 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 29 Jul 2024 11:51:29 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=BE=85=E7=AD=BE=E6=94=B6=E5=88=97?= =?UTF-8?q?=E8=A1=A8BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/distribution/mapper/DistributionSignforMapper.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 1beb630e9..366294c04 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1083,6 +1083,8 @@ LEFT JOIN logpm_distribution_stock_list AS ldsl ON ldrs.stocklist_id = ldsl.id WHERE lds.id = #{id} AND lds.is_deleted = 0 + GROUP BY + ldrs.stocklist_id diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java index dd001f79a..b49e0ad78 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java @@ -230,15 +230,17 @@ public class InComingServiceImpl implements IInComingService { if(incomingType == 1 || incomingType == 2){ for (TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity : advanceDetailEntityList) { - Long warehouseId1 = trunklineAdvanceDetailEntity.getWarehouseId(); - if(!warehouseId1.equals(warehouseId)){ - log.warn("############incomingPackage: 包件数据不在当前仓 packageCodes={} warehouseId={}", packageCodes, warehouseId); - return Resp.scanFail(405, "包件数据不在当前仓", "包件数据不在当前仓"); + String packageStatus = trunklineAdvanceDetailEntity.getPackageStatus(); + if("0".equals(packageStatus)){ + Long warehouseId1 = trunklineAdvanceDetailEntity.getWarehouseId(); + if(!warehouseId1.equals(warehouseId)){ + log.warn("############incomingPackage: 包件数据不在当前仓 packageCodes={} warehouseId={}", packageCodes, warehouseId); + return Resp.scanFail(405, "包件数据不在当前仓", "包件数据不在当前仓"); + } } } } - if(StringUtil.isNotBlank(customerTrain)){ for (TrunklineAdvanceDetailEntity advanceDetailEntity : advanceDetailEntityList) { String trainNumber = advanceDetailEntity.getTrainNumber(); @@ -344,9 +346,9 @@ public class InComingServiceImpl implements IInComingService { map.put("warehouseId", warehouseId); map.put("orderPackageCode", packageCode); R r = warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(map); - Object data = r.getData(); - if(!Objects.isNull(data)){ - audio.set((String) data); + int code = r.getCode(); + if(code != 200){ + audio.set(r.getMsg()); } } }); @@ -442,9 +444,9 @@ public class InComingServiceImpl implements IInComingService { map.put("warehouseId", warehouseId); map.put("orderPackageCode", packageCode); R r = warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(map); - Object data = r.getData(); - if(!Objects.isNull(data)){ - audio.set((String) data); + int code = r.getCode(); + if(code != 200){ + audio.set(r.getMsg()); } } }); @@ -495,7 +497,7 @@ public class InComingServiceImpl implements IInComingService { String a = audio.get(); if(StringUtil.isNotBlank(a)){ - return Resp.scanSuccess("入库成功",a); + return Resp.scanFail(405,a,a); } return R.success("入库成功"); 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 b44fc2e00..02be419d1 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 @@ -797,15 +797,16 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } //异步存入日志 + Date date = new Date(); String nickName = AuthUtil.getNickName(); Long userId = AuthUtil.getUserId(); - String createOperationRemark = "创建运单" + waybillNo + ",时间：" + CommonUtil.dateToStringGeneral(new Date()); + String createOperationRemark = "创建运单" + waybillNo + ",时间：" + CommonUtil.dateToStringGeneral(date); openOrderAsyncService.saveLog(waybillId, waybillNo, "10", "创建运单", createOperationRemark, nickName, userId, warehouseId, warehouseName); Integer totalCount = waybillEntity.getTotalCount(); Integer stockCount = waybillEntity.getStockCount(); if (totalCount.equals(stockCount)) { - createOperationRemark = "运单入库：" + stockCount + "/" + totalCount + ",入库类型：【零担开单及入库】,入库时间：" + CommonUtil.dateToStringGeneral(waybillEntity.getCreateTime()); + createOperationRemark = "运单入库：" + stockCount + "/" + totalCount + ",入库类型：【零担开单及入库】,入库时间：" + CommonUtil.dateToStringGeneral(date); openOrderAsyncService.saveLog(waybillId, waybillNo, "20", "已入库", createOperationRemark, nickName, userId, warehouseId, warehouseName); } @@ -1070,7 +1071,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntity.setCustomerName(openLabelDTO.getCustomerName()); advanceEntity.setCustomerPhone(openLabelDTO.getCustomerPhone()); advanceEntity.setCustomerAddress(openLabelDTO.getCustomerAddress()); - advanceEntity.setSystemType("线上"); + advanceEntity.setSystemType("线下"); advanceEntity.setServiceNum(openLabelDTO.getServiceNum()); advanceEntity.setMatingType("1"); advanceEntity.setSenderName(openLabelDTO.getSenderName()); @@ -1089,7 +1090,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceDetailModel.setAdvanceId(advanceId); advanceDetailModel.setOrderCode(openLabelDTO.getOrderCode()); advanceDetailModel.setBrand(openLabelDTO.getBrand()); - advanceDetailModel.setSystemType("线上"); + advanceDetailModel.setSystemType("线下"); // advanceDetailModel.setOrderPackageCode(basicdataCodeClient.getCodeByType(CodeNumConstant.PACKAGE, warehouseCode, orderCode)); advanceDetailModel.setFirstPackName(firsts); @@ -1106,6 +1107,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceDetailModel.setThirdPackName(thirds); } advanceDetailModel.setSiteName(openLabelDTO.getSiteName()); + advanceDetailModel.setMaterialName(openLabelDTO.getMaterialName()); advanceDetailModel.setQuantity(1); advanceDetailModel.setServiceNum(openLabelDTO.getServiceNum()); advanceDetailModel.setPackageStatus("0"); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java index c5d13170e..d91bd63af 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java @@ -160,7 +160,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeRecordService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeRecordService.java index 3544353e7..3cbf815e6 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeRecordService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeRecordService.java @@ -4,5 +4,5 @@ import com.logpm.basicdata.entity.BasicdataCodeRecordEntity; import org.springblade.core.mp.base.BaseService; public interface IBasicdataCodeRecordService extends BaseService { - BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(Integer type, String warehouseCode, String year, String month,String day); + BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(Integer type, String warehouseCode, String year, String month); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeRecordServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeRecordServiceImpl.java index f35f9d17e..e1fef9497 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeRecordServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeRecordServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; @AllArgsConstructor public class BasicdataCodeRecordServiceImpl extends BaseServiceImpl implements IBasicdataCodeRecordService { @Override - public BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(Integer type, String warehouseCode, String year, String month,String day) { - return baseMapper.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year,month,day); + public BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(Integer type, String warehouseCode, String year, String month) { + return baseMapper.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year,month); } } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java index 6fe073e11..ac9e14540 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java @@ -7,7 +7,6 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.service.IBasicdataCodeRecordService; import com.logpm.basicdata.service.IBasicdataCodeService; import com.logpm.basicdata.service.IBasicdataWarehouseService; -import io.swagger.models.auth.In; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springblade.common.constant.CodeDesEnum; @@ -201,9 +200,9 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { // 获取月份（注意月份从0开始计数） Integer month = calendar.get(Calendar.MONTH) + 1; - Integer day = calendar.get(Calendar.DAY_OF_MONTH); +// Integer day = calendar.get(Calendar.DAY_OF_MONTH); - BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type, basicdataWarehouseEntity.getWarehouseCode(), year + "", month + "", day + ""); + BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type, basicdataWarehouseEntity.getWarehouseCode(), year + "", month + ""); if (Objects.isNull(basicdataCodeRecordEntity)) { basicdataCodeRecordEntity = new BasicdataCodeRecordEntity(); @@ -213,7 +212,7 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { basicdataCodeRecordEntity.setWarehouseCode(basicdataWarehouseEntity.getWarehouseCode()); basicdataCodeRecordEntity.setYear(year + ""); basicdataCodeRecordEntity.setMonth(month + ""); - basicdataCodeRecordEntity.setDay(day + ""); +// basicdataCodeRecordEntity.setDay(day + ""); basicdataCodeRecordEntity.setNum(0); basicdataCodeRecordService.save(basicdataCodeRecordEntity); } From b9dab6dd5ab3310c0be50c3df2e5cdfb4f7c6bf7 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 29 Jul 2024 15:20:20 +0800 Subject: [PATCH 04/10] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/dto/LoadCarsDTO.java | 1 + .../impl/BasicdataCodeServiceImpl.java | 4 +++- .../mapper/TrunklineCarsLoadMapper.xml | 8 ++++++- .../service/impl/OpenOrderServiceImpl.java | 3 ++- .../impl/TrunklineBillladingServiceImpl.java | 21 +++++++++++++++---- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index 178ea743d..584ac8f4c 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -81,6 +81,7 @@ public class LoadCarsDTO implements Serializable { private List orderCodes; + private List orderCodeList; private Integer enterNum; diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java index ac9e14540..bbaf61501 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java @@ -136,6 +136,8 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { //包条 HT+仓库拼音/超管/职能+年月日时分秒+订单索引+包条个数索引CodeNumConstant.PACKAGE BasicdataCodeRecordEntity basicdataCodeRecordEntity = getBasicdataCodeRecordEntity(CodeDesEnum.PACKAGE.getCodeNum(), basicdataWarehouseEntity); + Calendar calendar = Calendar.getInstance(); + Integer day = calendar.get(Calendar.DAY_OF_MONTH); Integer oldNum = basicdataCodeRecordEntity.getNum(); List packageCodes = new ArrayList<>(); @@ -150,7 +152,7 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { String time = new String(System.currentTimeMillis() + ""); time=time.substring(4); oldNum = oldNum + 1; - String packageCode = "HT" + warehouseCode + year + CommonUtil.geFourNumberByString(basicdataCodeRecordEntity.getMonth(), 2) + basicdataCodeRecordEntity.getDay() + time; + String packageCode = "HT" + warehouseCode + year + CommonUtil.geFourNumberByString(basicdataCodeRecordEntity.getMonth(), 2) + day + time; packageCodes.add(packageCode); } basicdataCodeRecordEntity.setNum(oldNum); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index c810ebbce..f753683b3 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -574,8 +574,14 @@ #{item} + + and ldsa.order_code in + + #{item} + + - and Locate(#{param.waybillNo},lww.waybill_no) + and Locate(#{param.waybillNo},lww.waybill_no) > 0 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 02be419d1..3a54cd6c0 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 @@ -1385,7 +1385,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String materialName = pacakgeDetailExcelDTO.getMaterialName(); String materialCode = pacakgeDetailExcelDTO.getMaterialCode(); - + advanceDetailModel.setMaterialName(materialName); + advanceDetailModel.setMaterialCode(materialCode); if (StringUtil.isNotBlank(materialCode) && StringUtil.isNotBlank(materialName)) { Long materialId = materialMap.get(materialCode); if (!Objects.isNull(materialId)) { diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java index d91bd63af..00f3c10ac 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java @@ -204,7 +204,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl billladingWaybillEntities = billladingWaybillService.findNoFinishWaybillByBillladingId(billladingId); Map map = new HashMap<>(); @@ -480,7 +480,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl Date: Mon, 29 Jul 2024 15:41:17 +0800 Subject: [PATCH 05/10] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TrunklineAdvanceDetailServiceImpl.java | 2 +- .../service/impl/TrunklineCarsLoadServiceImpl.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java index 8bc0cc346..ddcc1bdd6 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java @@ -300,7 +300,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl Date: Mon, 29 Jul 2024 17:29:16 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=95=86=E9=85=8D=E9=9B=B6=E6=8B=85?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListController.java | 2 +- .../mapper/DistributionStockArticleMapper.xml | 4 +- .../IDistributionDeliveryListService.java | 2 +- .../DistributionDeliveryListServiceImpl.java | 47 ++++++++++++++++--- .../DistributionReservationServiceImpl.java | 5 +- .../impl/DistributionSignforServiceImpl.java | 1 + .../jobhandle/DistributionDatarepair.java | 2 +- 7 files changed, 50 insertions(+), 13 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index e9fefd3cd..e557e20cf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -400,7 +400,7 @@ public class DistributionDeliveryListController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "customArgs") public R getDeliveryZeroOrderDetail(@ApiIgnore @RequestParam Long deliveryId,@RequestParam Long orderId) { - R parcelNumberVOS = distributionDeliveryListService.getDeliveryZeroOrderDetail(deliveryId, orderId); + List parcelNumberVOS = distributionDeliveryListService.getDeliveryZeroOrderDetail(deliveryId, orderId); return R.data(parcelNumberVOS); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 71e22f46f..68a99c407 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -773,11 +773,11 @@ ldpl.brand_name AS brandName, ldpn.quantity AS quantity, ldpn.hand_quantity AS handQuantity, + ldpn.hand_quantity AS number, ldpn.delivery_quantity AS deliveryQuantity, ldpn.outbound_quantity AS outboundQuantity, ldpn.signin_quantity AS signinQuantity, - (ldpn.hand_quantity - ldpn.delivery_quantity) AS reservationNum, - ldpn.quantity AS `number` + (ldpn.hand_quantity - ldpn.delivery_quantity) AS reservationNum FROM logpm_distribution_stock_article AS ldsa LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldsa.id = ldpl.stock_article_id LEFT JOIN logpm_distribution_parcel_number AS ldpn ON ldpn.parcel_list_id = ldpl.id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index 7249b8d41..6a87f21ac 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -285,7 +285,7 @@ public interface IDistributionDeliveryListService extends BaseService getDeliveryZeroOrderDetail(Long deliveryId, Long orderId); /** * 零担装车 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index c59cdecbb..e8d307b88 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -3211,7 +3211,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelNumberVOS = s.getParcelNumberVOS(); @@ -3263,6 +3262,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplupdate().lambda() + .eq(DistributionParcelListEntity::getId,parcelNumberEntity.getParcelListId()) + .set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.yiyueyue.getValue()) + ); + } parcelNumberEntity.setDeliveryQuantity(num.intValue()); distributionReservationZeroPackageEntity.setQuantity(pn.getReservationNum()); distributionParcelNumberService.updateById(parcelNumberEntity); @@ -3414,6 +3420,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplupdate().lambda() + .eq(DistributionParcelListEntity::getId,parcelNumberEntity.getParcelListId()) + .set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.yiyueyue.getValue()) + ); parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() + pn.getReservationNum()); distributionParcelNumberService.updateById(parcelNumberEntity); packageNum.getAndAdd(reservationZeroPackageEntity.getQuantity()); @@ -3442,12 +3452,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode()); @@ -3490,17 +3501,25 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationZeroPackageEntityList = distributionReservationZeroPackageService.list(Wrappers.query().lambda().eq(DistributionReservationZeroPackageEntity::getReservationId, reservationEntity.getId()).eq(DistributionReservationZeroPackageEntity::getStockArticleId, reservationStockarticleEntity.getStockArticleId()).ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())); - reservationZeroPackageEntityList.forEach(rzp -> { + for (DistributionReservationZeroPackageEntity rzp : reservationZeroPackageEntityList) { rzp.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue()); distributionReservationZeroPackageService.updateById(rzp); DistributionParcelNumberEntity parcelNumberEntity = distributionParcelNumberService.getOne(Wrappers.query().lambda().eq(DistributionParcelNumberEntity::getParcelListId, rzp.getParcelListId())); if (Func.isNotEmpty(parcelNumberEntity)) { // parcelNumberEntity.setHandQuantity(parcelNumberEntity.getHandQuantity() + rzp.getQuantity()); parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() - rzp.getQuantity()); + int totalOutbound = parcelNumberEntity.getDeliveryQuantity() + parcelNumberEntity.getOutboundQuantity(); + if (!Objects.equals(totalOutbound,parcelNumberEntity.getQuantity())){ + //进行零担包件状态维护 + distributionParcelListService.update(Wrappers.update().lambda() + .eq(DistributionParcelListEntity::getId,parcelNumberEntity.getParcelListId()) + .set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.daiyuyue.getValue()) + ); + } distributionParcelNumberService.updateById(parcelNumberEntity); distributionAsyncService.checkZeroStockArticleReservationStatus(parcelNumberEntity); } - }); + } } else { log.error("###########################reservation_stockaticle的isZeroz字段维护错误,reservation_stockarticleID:{}", reservationStockarticleEntity.getId()); throw new RuntimeException("服务器正忙..."); @@ -3564,6 +3583,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplupdate().lambda() + .eq(DistributionParcelListEntity::getId,parcelNumberEntity.getParcelListId()) + .set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.daiyuyue.getValue()) + ); + } distributionParcelNumberService.updateById(parcelNumberEntity); distributionAsyncService.checkZeroStockArticleReservationStatus(parcelNumberEntity); } @@ -3649,6 +3676,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl getDeliveryZeroOrderDetail(Long deliveryId, Long orderId) { List loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda() .eq(DistributionLoadscanEntity::getDeliveryId, deliveryId) .eq(DistributionLoadscanEntity::getOrderId, orderId) .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) ); if (!Func.isEmpty(loadscanEntityList)){ - return R.fail("此订单已进行装车操作,请滞留后编辑"); + return null; } List zeroOrderDetail = distributionStockArticleService.getZeroOrderDetail(orderId); List parcelNumberVOS = baseMapper.selectDeliveryZeroOrderDetail(orderId, deliveryId); Map reservationNum = parcelNumberVOS.stream().collect(Collectors.toMap(DistributionParcelNumberVO::getParcelListId, Function.identity(), (k1, k2) -> k2)); zeroOrderDetail.forEach(z -> { + Integer integer = 0; if (Func.isNotEmpty(reservationNum.get(z.getParcelListId()))) { + integer = reservationNum.get(z.getParcelListId()).getReservationNum(); z.setReservationNum(reservationNum.get(z.getParcelListId()).getReservationNum()); } + int quantity = z.getHandQuantity() - z.getDeliveryQuantity() + integer; + z.setNumber(quantity); }); - return R.data(zeroOrderDetail); + return zeroOrderDetail; } @Override diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index 1f78c1e0d..87f534eff 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -36,7 +36,6 @@ import com.logpm.distribution.vo.*; import com.logpm.distribution.wrapper.*; import com.logpm.oldproject.feign.IWayBillClient; import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; -import com.logpm.trunkline.feign.ITrunklineWaybillTrackClient; import com.logpm.warehouse.entity.WarehouseGoodsAllocationEntity; import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.IWarehouseGoodsAllocationClient; @@ -349,6 +348,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl distributionStockArticleVOS = new ArrayList<>(); if (Func.isNotEmpty(reservationStockarticleEntityList)) { reservationStockarticleEntityList.forEach(rs -> { + AtomicInteger num = new AtomicInteger(); DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(rs.getStockArticleId()); DistributionStockArticleVO distributionStockArticleVO = DistributionStockArticleWrapper.build().entityVO(stockArticleEntity); if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) { @@ -359,6 +359,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl distributionParcelListVOS = new ArrayList<>(); reservationPackageEntityList.forEach(rp -> { + num.addAndGet(1); DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(rp.getParceListId()); DistributionParcelListVO parcelListVOS = DistributionParcelListWrapper.build().entityVO(parcelListEntity); parcelListVOS.setQuantity(parcelListEntity.getQuantity()); @@ -380,6 +381,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl 0) { + //查询库存品扫描签收 List loadingPushOldInventory = distributionSignforMapper.selectLoadingPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); List signingPushOldInventory = distributionSignforMapper.selectSigningPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java index 91e2b4d40..c72578099 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java @@ -239,7 +239,7 @@ public class DistributionDatarepair { Long id = entries.getLong("billId"); Boolean b =distrilbutionBillLadingClient.clerkBillCheckPushData(id); if(b!=null&&b){ - warehouseMappingDataMapper.updateClearSignforStatus(id, entries.getLong("warehouseId"), 1); + warehouseMappingDataMapper.updateClearBillSignforStatus(entries.getLong("id"), entries.getLong("warehouseId"), 1); log.info(">>> pushBillNotification 成功 id={}",id); }else{ log.error(">>> pushBillNotification 失败 id="+id); From 72222ca37ee04cc3506afefecd9e2fbf4b875e78 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 29 Jul 2024 18:03:53 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=9B=9E=E4=BC=A0=E8=A1=A5=E4=B8=81?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=BA=93=E5=AD=98=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionSignforServiceImpl.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index c890b2952..1a105e936 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -6528,21 +6528,21 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 0) { - - //查询库存品扫描签收 - List loadingPushOldInventory = distributionSignforMapper.selectLoadingPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); - List signingPushOldInventory = distributionSignforMapper.selectSigningPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); - if (Func.isNotEmpty(loadingPushOldInventory)) { - buildNameAndPhone(loadingPushOldInventory); - signPushDataUnitDTOS.addAll(loadingPushOldInventory); - } - - if (Func.isNotEmpty(signingPushOldInventory)) { - buildNameAndPhone(signingPushOldInventory); - signPushDataUnitDTOS.addAll(signingPushOldInventory); - } - } +// if (distributionReservationEntity.getReservationStockListNum() > 0) { +// +// //查询库存品扫描签收 +// List loadingPushOldInventory = distributionSignforMapper.selectLoadingPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); +// List signingPushOldInventory = distributionSignforMapper.selectSigningPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); +// if (Func.isNotEmpty(loadingPushOldInventory)) { +// buildNameAndPhone(loadingPushOldInventory); +// signPushDataUnitDTOS.addAll(loadingPushOldInventory); +// } +// +// if (Func.isNotEmpty(signingPushOldInventory)) { +// buildNameAndPhone(signingPushOldInventory); +// signPushDataUnitDTOS.addAll(signingPushOldInventory); +// } +// } //查询签收图片 List distributionSignPrintVOS = distributionSignforMapper.selectSignImgsUrl(distributionReservationEntity.getId()); From 75aab2664289c028aa77f2dbc6f6d97b33a31283 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 29 Jul 2024 18:52:55 +0800 Subject: [PATCH 08/10] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=8F=B8=E6=9C=BA?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=A4=9A=E4=B8=AA=E8=81=8C=E8=B4=A3=E7=9A=84?= =?UTF-8?q?=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/entity/BasicdataDriverArteryEntity.java | 2 +- .../logpm/basicdata/vo/BasicdataDriverArteryVO.java | 6 ++++++ .../controller/BasicdataDriverArteryController.java | 11 +++++++---- .../logpm/basicdata/dto/BasicdataDriverArteryDTO.java | 2 ++ .../basicdata/mapper/BasicdataDriverArteryMapper.java | 2 +- .../basicdata/mapper/BasicdataDriverArteryMapper.xml | 4 ++-- .../impl/BasicdataDriverArteryServiceImpl.java | 2 +- 7 files changed, 20 insertions(+), 9 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java index 597e85090..3aa2fc6a5 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java @@ -62,7 +62,7 @@ public class BasicdataDriverArteryEntity extends TenantEntity { /** * 职务类型;1-干线,2-配送 */ - @ApiModelProperty(value = "职务类型;1-干线,2-配送,3-全部") + @ApiModelProperty(value = "职务类型;1-干线,2-配送") private String jobType; /** * 准驾车型;1-A1,2-A2,3-A3,4-B1,5-B2,6-C1,7-C2 diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataDriverArteryVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataDriverArteryVO.java index 72de2c0ae..894f8754f 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataDriverArteryVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataDriverArteryVO.java @@ -50,6 +50,12 @@ public class BasicdataDriverArteryVO extends BasicdataDriverArteryEntity { @ApiModelProperty(value = "司机关联车辆列表") private List vehicleVOList; + /** + * 司机类型 + */ + private List jobTypeString; + + private List warehouses = new ArrayList<>(); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java index 34a572b6d..67e8fbbd2 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java @@ -34,6 +34,7 @@ import com.logpm.basicdata.vo.BasicdataDriverWarehouseVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import jodd.util.ArraysUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; @@ -54,10 +55,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 司机信息表 控制器 @@ -95,6 +93,11 @@ public class BasicdataDriverArteryController extends BladeController { List warehouseIds = basicdataDriverWarehouseService.findByDriverId(driverId); BasicdataDriverArteryVO basicdataDriverArteryVO = new BasicdataDriverArteryVO(); BeanUtil.copy(detail,basicdataDriverArteryVO); + + // 拆分 司机类型 + String[] split = basicdataDriverArteryVO.getJobType().split(","); + List list = Arrays.asList(split); + basicdataDriverArteryVO.setJobTypeString(list); basicdataDriverArteryVO.setWarehouses(warehouseIds); basicdataDriverArteryVO.setBindVehicles(String.join(",",vehicleIds)); return R.data(basicdataDriverArteryVO); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataDriverArteryDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataDriverArteryDTO.java index 27c8f85c0..b5ab2870f 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataDriverArteryDTO.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataDriverArteryDTO.java @@ -41,4 +41,6 @@ public class BasicdataDriverArteryDTO extends BasicdataDriverArteryEntity { private String bindVehicles; private List warehouseIds = new ArrayList<>(); + + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java index dd5cbf1ab..e4112f933 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java @@ -69,7 +69,7 @@ public interface BasicdataDriverArteryMapper extends BaseMapper selectListByWarehouseId(@Param("warehouseId") Long warehouseId); + List selectListByWarehouseId(@Param("warehouseId") Long warehouseId,@Param("jobType")String jobType); BasicdataDriverArteryEntity findEntityByPhone(@Param("phone") String phone); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml index b15895d84..fee6fa8be 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml @@ -168,13 +168,12 @@ left join logpm_basicdata_vehicle lbv on lbv.id = lbdm.brand_id where lbda.`name` like concat('%',#{driverName},'%') - and lbda.job_type = #{jobType} + and locate(#{jobType},lbda.job_type)>0 group by lbda.id, lbda.name, lbda.phone, lbda.type - limit 10 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java index 73c263bd4..07bad0f82 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java @@ -140,7 +140,7 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl basicdataDriverArteryVOS = new ArrayList<>(); - List list = baseMapper.selectListByWarehouseId(warehouseId); + List list = baseMapper.selectListByWarehouseId(warehouseId,"2"); log.info("################getDriverList list:{}", list); if(list.isEmpty()){ From be36f40de417b99d9ed5a05f591f51585f62d061 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 29 Jul 2024 18:57:41 +0800 Subject: [PATCH 09/10] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/vo/ZeroSuppleVO.java | 1 + .../mapper/TrunklineCarsLoadMapper.xml | 13 ++++- .../impl/TrunklineCarsLoadServiceImpl.java | 52 ++++++++++++++++--- 3 files changed, 56 insertions(+), 10 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java index 4decd1cdb..5302f0a09 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java @@ -12,6 +12,7 @@ public class ZeroSuppleVO implements Serializable { private String orderCode; private Integer enterNum;//输入数量 private Long finalNodeId;//目的仓id + private Long signOrderId;//签收单id } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index f753683b3..137ddb195 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -52,7 +52,7 @@ and ltcl.load_status = #{param.loadStatus} - and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_name) > 0) + and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0) and ltcl.create_time >= #{param.createTimeStart} @@ -135,6 +135,9 @@ and ltcl.end_warehouse_ids like concat('%',#{param.warehouseId},'%') + + and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0) + and Locate(#{param.loadCarsNo},ltcl.cars_no) > 0 @@ -561,13 +564,19 @@ IFNULL(lww.total_freight,0) totalFreight, lww.total_count, lww.remark remark, - ROUND(lww.total_freight/lww.total_count,2) price + ROUND(lww.total_freight/lww.total_count,2) price, + ltlso.load_sign_code loadSignCode, + ltlso.id signOrderId from logpm_distribution_stock_article ldsa left join logpm_warehouse_waybill lww on lww.waybill_no = ldsa.waybill_number + left join logpm_trunkline_load_sign_order ltlso on ltlso.mall_name = ldsa.mall_name and ltlso.load_id = #{param.loadId} where ldsa.is_zero = 1 and lww.destination_warehouse_id != #{param.warehouseId} and ldsa.hand_quantity > 0 and ldsa.warehouse_id = #{param.warehouseId} + + and ltlso.id is not null + and ldsa.order_code not in diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 78d126c6b..ae0461c3f 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -2880,7 +2880,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl 0 ){ +// signOrderEntity.setSignStatus("10"); +// } +// trunklineLoadSignOrderService.updateById(signOrderEntity); + } } //更新数量 updateNumByLoadId(loadId); @@ -5228,10 +5242,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl num){ + log.warn("##############signScanPackageCode: 签收数量不能大于当前数据的装车数量 num={} enterNum={}", num, enterNum); + return R.fail(405, "签收数量不能大于当前数据的装车数量"); + } + carsLoadScanEntity.setScanStatus("3"); carsLoadScanEntity.setUnloadNum(enterNum); carsLoadScanEntity.setUnloadAbnormal(0); @@ -6002,11 +6022,27 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("sign_order_id",signOrderId) + .eq("type",2) + .eq("scan_status","3"); - + List carsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper); + carsLoadScanEntityList.forEach(carsLoadScanEntity -> { + Integer num = carsLoadScanEntity.getNum(); + Integer unloadNum = carsLoadScanEntity.getUnloadNum(); + String orderCode = carsLoadScanEntity.getOrderCode(); + Long fromWarehouseId = carsLoadScanEntity.getFromWarehouseId(); + if(unloadNum != num){ + int diff = num - unloadNum; + DistributionStockArticleEntity stockArticle = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, fromWarehouseId); + distributionStockArticleClient.addHandQuantity(stockArticle.getId(), diff); + } + }); + trunklineLoadSignOrderService.updateById(signOrderEntity); } - - return R.success("添加成功"); } From e184375153622711467ec2a1158b4694887b15c8 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 30 Jul 2024 10:07:14 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E8=A1=A5=E4=B8=81=E5=BB=B6=E8=BF=9F?= =?UTF-8?q?=E4=B8=80=E5=88=86=E9=92=9F=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jobhandle/DistributionDatarepair.java | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java index c72578099..171609dce 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java @@ -236,14 +236,22 @@ public class DistributionDatarepair { } List allSignfor = warehouseMappingDataMapper.findAllBillSign(parmeId); for (JSONObject entries : allSignfor) { - Long id = entries.getLong("billId"); - Boolean b =distrilbutionBillLadingClient.clerkBillCheckPushData(id); - if(b!=null&&b){ - warehouseMappingDataMapper.updateClearBillSignforStatus(entries.getLong("id"), entries.getLong("warehouseId"), 1); - log.info(">>> pushBillNotification 成功 id={}",id); - }else{ - log.error(">>> pushBillNotification 失败 id="+id); + try { + Long id = entries.getLong("billId"); + Boolean b =distrilbutionBillLadingClient.clerkBillCheckPushData(id); + if(b!=null&&b){ + warehouseMappingDataMapper.updateClearBillSignforStatus(entries.getLong("id"), entries.getLong("warehouseId"), 1); + log.info(">>> pushBillNotification 成功 id={}",id); + }else{ + log.error(">>> pushBillNotification 失败 id="+id); + } + Thread.sleep(1000*60); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } finally { + log.error(">>> pushBillNotification 释放"); } + } return ReturnT.SUCCESS; }