Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java

@@ -175,8 +175,8 @@ public class DistributionStockupController extends BladeController {
 	public R<List<User>> listUser() {
 		//获取当前登录用户
 		BladeUser user = AuthUtil.getUser();
-//		List<User> cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), "拣货员");
+		List<User> cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), "拣货员");
-		List<User> cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), "叉车");
+//		List<User> cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), ?"叉车");
 		return R.data(cc);
 	}
 

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

@@ -258,4 +258,33 @@ public class SyncOrderInfoToPlatform {
 //	}
 
 
+	@XxlJob("addTrayType")
+	public ReturnT<String> addTrayType(String param) {
+		log.info("############addTrayType: 同步打托数据开始");
+
+		//查询需要同步的仓库
+		List<WarehouseMappingDataEntity> warehouseMappingDataEntityList = warehouseMappingDataService.getWarehouseMapping();
+		if(warehouseMappingDataEntityList.isEmpty()){
+			log.warn("###############syncTrayType: 当前没有配置需要同步的仓库信息");
+			return ReturnT.FAIL;
+		}
+		try{
+			for (WarehouseMappingDataEntity entity:warehouseMappingDataEntityList){
+				Integer oldWarehouseId = entity.getOldWarehouseId();
+				Long newWarehouseId = entity.getNewWarehouseId();
+
+				syncOrderInfoService.addTrayType(oldWarehouseId,newWarehouseId);
+			}
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return ReturnT.FAIL;
+		}catch (Exception e){
+			log.error("#############syncTrayType: 同步数据失败",e);
+			return ReturnT.FAIL;
+		}
+
+		return ReturnT.SUCCESS;
+	}
+
+
 }

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

@@ -9,4 +9,6 @@ public interface ISyncOrderInfoService {
 
 	void syncTrayType(Integer oldWarehouseId,Long newWarehouseId);
 
+	void addTrayType(Integer oldWarehouseId, Long newWarehouseId);
+
 }

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

@@ -78,14 +78,14 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 				continue;
 			}
 			//查询订单是否在盘点任务中有被盘点到
-			InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findOrderIsExist(orderCode);
+//			InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findOrderIsExist(orderCode);
-			if(!Objects.isNull(inventoryDetailEntity)){
+//			if(!Objects.isNull(inventoryDetailEntity)){
 				//定单
 				saveOrderInfo(orderCode,oldWarehouseId,newWarehouseId);
 
 				//存入打托信息
 				saveTrayTypeInfoPackage(orderCode,oldWarehouseId,newWarehouseId);
-			}
+//			}
 		}
 	}
 
@@ -129,6 +129,110 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 
 	}
 
+	@Override
+	public void addTrayType(Integer oldWarehouseId, Long newWarehouseId) {
+
+		List<String> ls = new ArrayList<>();
+		ls.add("P01212310099180998");
+		ls.add("P0099231005B610669");
+		ls.add("P0099231005B610668");
+		ls.add("P0099231005B610667");
+		ls.add("P0099231005B610666");
+		ls.add("P0099231005B610665");
+		ls.add("P0099231005B610664");
+		ls.add("P0099231005B610663");
+		ls.add("P0099231005B610662");
+		ls.add("P0099231005B610661");
+		ls.add("P0099231005B610620");
+		ls.add("P0099231005B610619");
+		ls.add("P0099231005B608659");
+		ls.add("P0099231005B608640");
+		ls.add("P0068231005B617264");
+		ls.add("P0068231005B617263");
+		ls.add("P0068231005B617262");
+		ls.add("P0068231005B607646");
+		ls.add("P0068231005B607645");
+		ls.add("P0068231005B607644");
+		ls.add("P0068231005B607643");
+		ls.add("P0068231005B607642");
+		ls.add("P00602309198079030");
+		ls.add("P00602309198077996");
+		ls.add("P00482310129414549");
+		ls.add("P00482310079066092");
+		ls.add("P00432310109253845");
+		ls.add("P00432310099188118");
+		ls.add("P00432310099188117");
+		ls.add("P00432310099188023");
+		ls.add("P00432310099182388");
+		ls.add("P00432310099182260");
+		ls.add("P00432310099182258");
+		ls.add("P00432310099181733");
+		ls.add("P00432310099181637");
+		ls.add("P00432310099168457");
+		ls.add("P00432310099166358");
+		ls.add("P00432310089131840");
+		ls.add("P00432310089131836");
+		ls.add("P00432310089131827");
+		ls.add("P00432310089131825");
+		ls.add("P00432310089119618");
+		ls.add("P00432310089119617");
+		ls.add("P00432310079074600");
+		ls.add("P00432310079074599");
+		ls.add("P00432310079071820");
+		ls.add("P00432310079068534");
+		ls.add("P00432310079068533");
+		ls.add("P0042231005B605653");
+		ls.add("P0042231005B605652");
+		ls.add("P0042231005B605651");
+		ls.add("P0042231005B605649");
+		ls.add("P0042231005B605648");
+		ls.add("P0042231005B605647");
+		ls.add("P0042231005B605646");
+		ls.add("P0042231005B605645");
+		ls.add("P0042231005B605598");
+		ls.add("P00412310099233225");
+		ls.add("P0041231007B673647");
+		ls.add("P0041231007B673642");
+		ls.add("P0041231007B673609");
+		ls.add("P0041231007B673487");
+		ls.add("P00382310109273131");
+		ls.add("P00382310089115658");
+		ls.add("P0038231004B544202");
+		ls.add("P0038231004B544201");
+		ls.add("P0038231004B544181");
+		ls.add("P0038231004B544160");
+		ls.add("P00372310068977438");
+		ls.add("P00372310068977436");
+		ls.add("P00372309188008935");
+		ls.add("P00372309188008925");
+		ls.add("P00372309188008904");
+		ls.add("P00372309147735046");
+		ls.add("P00372309147735044");
+		ls.add("P00372309147735041");
+		ls.add("P00372309147731656");
+		ls.add("P00372309147708355");
+		ls.add("P00312309188009504");
+
+
+		for (String orderPackageCode:ls){
+
+
+			Map<String,Object> map = new HashMap<>();
+			map.put("trayType","30");
+			map.put("trayCode","T33278");
+			map.put("warehouseId",newWarehouseId);
+			map.put("orderPackageCode",orderPackageCode);
+
+			//新系统保存打托方式
+			boolean b = warehouseTrayTypeClient.orderScanOrderPackageCode(map);
+
+			if(!b){
+				log.error("################addTrayType: 包件打托失败 orderPackageCode={} trayCode={}",orderPackageCode,"T33278");
+			}
+		}
+
+	}
+
 	private void saveTrayTypeInfoPackage(String orderCode,Integer oldWarehouseId,Long newWarehouseId) {
 
 		//如果是订制品就先查询该订单有哪些包件打了托
@@ -137,11 +241,11 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 			Integer trayScanId = trayScanDesEntity.getTrayScanId();
 			String unitNo = trayScanDesEntity.getUnitNo();//包条码
 
-			InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findUnitNoIsExist(unitNo);
+//			InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findUnitNoIsExist(unitNo);
-			if(Objects.isNull(inventoryDetailEntity)){
+//			if(Objects.isNull(inventoryDetailEntity)){
-				log.info("###########saveTrayTypeInfoPackage: 包条不在盘点任务中存在，不同步 unitNo={}",unitNo);
+//				log.info("###########saveTrayTypeInfoPackage: 包条不在盘点任务中存在，不同步 unitNo={}",unitNo);
-				continue;
+//				continue;
-			}
+//			}
 			//查询打托方式信息
 			TrayScanEntity trayScanEntity = trayScanClient.getEntityByTrayScanId(trayScanId);
 			Integer type = trayScanEntity.getType();
@@ -177,7 +281,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 
 			if(!b){
 				log.error("################saveTrayTypeInfo: 包件打托失败 unitNo={} trayCode={}",unitNo,"T"+trayId);
-				throw new CustomerException(403,"包件打托失败");
+//				throw new CustomerException(403,"包件打托失败");
 			}
 		}
 	}
@@ -770,11 +874,11 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 		List<OrderDetailEntity> orderDetailList = orderDetailClient.findByOrderCode(orderCode,oldWarehouseId);
 		for (OrderDetailEntity orderDetailEntity:orderDetailList){
 			String unitNo = orderDetailEntity.getUnitNo();
-			InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findUnitNoIsExist(unitNo);
+//			InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findUnitNoIsExist(unitNo);
-			if(Objects.isNull(inventoryDetailEntity)){
+//			if(Objects.isNull(inventoryDetailEntity)){
-				log.info("###########saveOrderPackage: 包条不在盘点任务中存在，不同步 unitNo={}",unitNo);
+//				log.info("###########saveOrderPackage: 包条不在盘点任务中存在，不同步 unitNo={}",unitNo);
-				continue;
+//				continue;
-			}
+//			}
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(unitNo);
 			if(!Objects.isNull(parcelListEntity)){
 				log.info("###########saveOrderPackage: 包条已存在，不同步 unitNo={}",unitNo);