Merge branch 'dev' into pre-production

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

@@ -766,4 +766,33 @@ public class SyncOrderInfoToPlatform {
 	}
 
 
+	@XxlJob("dealWithPackageUpdown")
+	public ReturnT<String>  dealWithPackageUpdown(String param) {
+		log.info("############dealWithPackageUpdown: 处理包件上架  开始");
+
+		if(StringUtil.isBlank(param)){
+			log.warn("############dealWithPackageUpdown: 仓库id为空");
+			return ReturnT.FAIL;
+		}
+
+		Long warehouseId = Long.parseLong(param);
+
+		List<JSONObject> ls = warehouseMappingDataService.findPackageUpdownData();
+
+		for (JSONObject l : ls) {
+			Integer id = l.getInt("id");
+			String orderPackageCode = l.getStr("orderPackageCode");
+			Long allocationId = l.getLong("allocationId");
+
+			syncOrderInfoService.dealWithPackageUpdown(orderPackageCode,allocationId,warehouseId);
+
+			warehouseMappingDataService.updatePackageUpdownStatus(id,1);
+		}
+
+		log.info("############dealWithPackageUpdown: 处理包件上架  完成");
+
+		return ReturnT.SUCCESS;
+	}
+
+
 }

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

@@ -85,4 +85,9 @@ public interface WarehouseMappingDataMapper {
     List<SyncZeroOrderVO> findAllZeroOrder();
 
 	void updateSyncZeroStatus(@Param("id") Integer id, @Param("syncStatus") Integer syncStatus);
+
+    List<JSONObject> findPackageUpdownData();
+
+	void updatePackageUpdownStatus(@Param("id") Integer id, @Param("syncStatus") Integer syncStatus);
+
 }

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

@@ -256,5 +256,18 @@
         where id = #{id}
     </update>
 
+    <select id="findPackageUpdownData" resultType="cn.hutool.json.JSONObject">
+        select id id,
+               order_package_code orderPackageCode,
+               allocation_id allocationId
+        from deal_with_package_updown
+        where sync_status = 0
+    </select>
+
+    <update id="updatePackageUpdownStatus">
+        update deal_with_package_updown
+        set sync_status = #{syncStatus}
+        where id = #{id}
+    </update>
 
 </mapper>

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

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

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

@@ -83,4 +83,8 @@ public interface IWarehouseMappingDataService {
     List<SyncZeroOrderVO> findAllZeroOrder();
 
 	void updateSyncZeroStatus(Integer id, Integer syncStatus);
+
+	List<JSONObject> findPackageUpdownData();
+
+	void updatePackageUpdownStatus(Integer id, Integer syncStatus);
 }

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

@@ -349,6 +349,14 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 		}
 	}
 
+	@Override
+	public void dealWithPackageUpdown(String orderPackageCode, Long allocationId,Long warehouseId) {
+		warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCode,warehouseId,"系统下架解托");
+
+		warehouseUpdownTypeClient.upShelfPackage(orderPackageCode,allocationId,warehouseId,"系统上架");
+
+	}
+
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override

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

@@ -195,4 +195,14 @@ public class WarehouseMappingDataServiceImpl implements IWarehouseMappingDataSer
 	public void updateSyncZeroStatus(Integer id, Integer syncStatus) {
 		warehouseMappingDataMapper.updateSyncZeroStatus(id,syncStatus);
 	}
+
+	@Override
+	public List<JSONObject> findPackageUpdownData() {
+		return warehouseMappingDataMapper.findPackageUpdownData();
+	}
+
+	@Override
+	public void updatePackageUpdownStatus(Integer id, Integer syncStatus) {
+		warehouseMappingDataMapper.updatePackageUpdownStatus(id,syncStatus);
+	}
 }