diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java index 956c875b3..47d5fb990 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java @@ -672,4 +672,29 @@ public class SyncOrderInfoToPlatform { } + @XxlJob("clearOrderPackageStatusSign") + public ReturnT clearOrderPackageStatusSign(String param) { + log.info("############clearOrderPackageStatusSign: 清理包件数据为已签收 开始"); + + List ls = warehouseMappingDataService.findAllOrderPackage(); + + for (JSONObject l : ls) { + String orderPackageCode = l.getStr("orderPackageCode"); + Long warehouseId = l.getLong("warehouseId"); + + syncOrderInfoService.clearOrderPackageStatusSign(orderPackageCode,warehouseId); + + warehouseMappingDataService.updateClearOrderPackageStatusSignStatus(orderPackageCode,warehouseId,1); + } + + + + log.info("############repairNoOpenOrderOrderInfo: 清理包件数据为已签收 完成"); + + return ReturnT.SUCCESS; + } + + + + } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java index 9c8f1107a..19c03ebbe 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java @@ -52,4 +52,8 @@ public interface WarehouseMappingDataMapper { void updatePackageStatus(@Param("packageStatuss") String packageStatuss, @Param("packageId") Long packageId); List findAllOrderCode(); + + List findAllOrderPackage(); + + void updateClearOrderPackageStatusSignStatus(@Param("orderPackageCode") String orderPackageCode, @Param("warehouseId") Long warehouseId, @Param("dealStatus") Integer dealStatus); } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml index 30271d5da..917c4baf5 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml @@ -162,4 +162,18 @@ HAVING count(ldpl.id) != ldsa.total_number + + + + update clear_package_status_record + set deal_status = #{dealStatus} + where order_package_code = #{orderPackageCode} + and warehouse_id = #{warehouseId} + + diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncOrderInfoService.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncOrderInfoService.java index 713d44d12..316d486d0 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncOrderInfoService.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncOrderInfoService.java @@ -19,4 +19,5 @@ public interface ISyncOrderInfoService { void repairNoOpenOrderOrderInfo(String orderCode); + void clearOrderPackageStatusSign(String orderPackageCode, Long warehouseId); } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java index e40f4b588..e9c5f032a 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java @@ -48,4 +48,8 @@ public interface IWarehouseMappingDataService { void updatePackageStatus(String packageStatuss, Long packageId); List findAllOrderCode(); + + List findAllOrderPackage(); + + void updateClearOrderPackageStatusSignStatus(String orderPackageCode, Long warehouseId, Integer dealStatus); } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java index 6c0d890fa..60a0446c9 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java @@ -301,6 +301,21 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { } + @Override + public void clearOrderPackageStatusSign(String orderPackageCode, Long warehouseId) { + + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId); + if(!Objects.isNull(parcelListEntity)){ + String orderCode = parcelListEntity.getOrderCode(); + parcelListEntity.setOrderPackageStatus("70"); + parcelListEntity.setOrderPackageGroundingStatus("10"); + + distributionParcelListClient.update(parcelListEntity); + distributionStockArticleClient.updateOrderInfo(orderCode,warehouseId); + warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCode,warehouseId); + } + } + @Transactional(rollbackFor = Exception.class) @Override diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java index d4e117439..cb1f277e5 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java @@ -121,4 +121,14 @@ public class WarehouseMappingDataServiceImpl implements IWarehouseMappingDataSer public List findAllOrderCode() { return warehouseMappingDataMapper.findAllOrderCode(); } + + @Override + public List findAllOrderPackage() { + return warehouseMappingDataMapper.findAllOrderPackage(); + } + + @Override + public void updateClearOrderPackageStatusSignStatus(String orderPackageCode, Long warehouseId, Integer dealStatus) { + warehouseMappingDataMapper.updateClearOrderPackageStatusSignStatus(orderPackageCode,warehouseId,dealStatus); + } }