Merge branch 'dev' into pre-production

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

@@ -672,4 +672,29 @@ public class SyncOrderInfoToPlatform {
 	}
 
 
+	@XxlJob("clearOrderPackageStatusSign")
+	public ReturnT<String>  clearOrderPackageStatusSign(String param) {
+		log.info("############clearOrderPackageStatusSign: 清理包件数据为已签收   开始");
+
+		List<JSONObject> 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;
+	}
+
+
+
+
 }

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<JSONObject> findAllOrderCode();
+
+    List<JSONObject> findAllOrderPackage();
+
+	void updateClearOrderPackageStatusSignStatus(@Param("orderPackageCode") String orderPackageCode, @Param("warehouseId") Long warehouseId, @Param("dealStatus") Integer dealStatus);
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml

@@ -162,4 +162,18 @@
         HAVING count(ldpl.id) != ldsa.total_number
     </select>
 
+    <select id="findAllOrderPackage" resultType="cn.hutool.json.JSONObject">
+        select order_package_code orderPackageCode,
+               warehouse_id warehouseId
+        from clear_package_status_record
+        where deal_status = 0
+    </select>
+
+    <update id="updateClearOrderPackageStatusSignStatus" >
+        update clear_package_status_record
+        set deal_status = #{dealStatus}
+        where order_package_code = #{orderPackageCode}
+        and warehouse_id = #{warehouseId}
+    </update>
+
 </mapper>

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);
 }

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<JSONObject> findAllOrderCode();
+
+    List<JSONObject> findAllOrderPackage();
+
+	void updateClearOrderPackageStatusSignStatus(String orderPackageCode, Long warehouseId, Integer dealStatus);
 }

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

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<JSONObject> findAllOrderCode() {
 		return warehouseMappingDataMapper.findAllOrderCode();
 	}
+
+	@Override
+	public List<JSONObject> findAllOrderPackage() {
+		return warehouseMappingDataMapper.findAllOrderPackage();
+	}
+
+	@Override
+	public void updateClearOrderPackageStatusSignStatus(String orderPackageCode, Long warehouseId, Integer dealStatus) {
+		warehouseMappingDataMapper.updateClearOrderPackageStatusSignStatus(orderPackageCode,warehouseId,dealStatus);
+	}
 }