Merge branch 'dev' into pre-production

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/InventoryDetailMapper.xml

@@ -38,3 +38,4 @@
     </select>
 
 </mapper>
+

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java

@@ -782,4 +782,28 @@ public class SyncOrderInfoToPlatform {
 		return ReturnT.SUCCESS;
 	}
 
+
+	@XxlJob("clearOrderPackageStatusOut")
+	public ReturnT<String>  clearOrderPackageStatusOut(String param) {
+		log.info("############clearOrderPackageStatusOut: 清理包件数据为已出库   开始");
+
+		List<JSONObject> ls = warehouseMappingDataService.findAllOrderPackage();
+
+		for (JSONObject l : ls) {
+			String orderPackageCode = l.getStr("orderPackageCode");
+			Long warehouseId = l.getLong("warehouseId");
+
+			syncOrderInfoService.clearOrderPackageStatusOut(orderPackageCode,warehouseId);
+
+			warehouseMappingDataService.updateClearOrderPackageStatusSignStatus(orderPackageCode,warehouseId,1);
+		}
+
+
+
+		log.info("############repairNoOpenOrderOrderInfo: 清理包件数据为已签收  完成");
+
+		return ReturnT.SUCCESS;
+	}
+
+
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncOrderInfoService.java

@@ -22,4 +22,6 @@ public interface ISyncOrderInfoService {
 	void clearOrderPackageStatusSign(String orderPackageCode, Long warehouseId);
 
 	void clearOrderPackageStatusStock(String orderPackageCode, Long warehouseId);
+
+	void clearOrderPackageStatusOut(String orderPackageCode, Long warehouseId);
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -331,6 +331,20 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 		}
 	}
 
+	@Override
+	public void clearOrderPackageStatusOut(String orderPackageCode, Long warehouseId) {
+		DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
+		if(!Objects.isNull(parcelListEntity)){
+			String orderCode = parcelListEntity.getOrderCode();
+			parcelListEntity.setOrderPackageStatus("60");
+			parcelListEntity.setOrderPackageGroundingStatus("10");
+
+			distributionParcelListClient.update(parcelListEntity);
+			distributionStockArticleClient.updateOrderInfo(orderCode,warehouseId);
+			warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCode,warehouseId);
+		}
+	}
+
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override