From a0b2a0bbc1f54446f0fb4a136f4297b8e054b692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98chaoosc=E2=80=99?= <‘chaoosc@gmail.com’> Date: Thu, 19 Oct 2023 23:36:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8F=89=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DistributionStockupController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java index 1c6ff1dcc..bade69469 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java @@ -175,8 +175,8 @@ public class DistributionStockupController extends BladeController { public R> listUser() { //获取当前登录用户 BladeUser user = AuthUtil.getUser(); -// List cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), "拣货员"); - List cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), "叉车"); + List cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), "拣货员"); +// List cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), ?"叉车"); return R.data(cc); } From caceb1356952085280c55c5dc3bc0f909d401263 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 19 Oct 2023 23:36:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AEbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jobhandle/SyncOrderInfoToPlatform.java | 29 ++++ .../patch/service/ISyncOrderInfoService.java | 2 + .../impl/SyncOrderInfoServiceImpl.java | 132 ++++++++++++++++-- 3 files changed, 149 insertions(+), 14 deletions(-) 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 9150c70af..1761d1e64 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 @@ -258,4 +258,33 @@ public class SyncOrderInfoToPlatform { // } + @XxlJob("addTrayType") + public ReturnT addTrayType(String param) { + log.info("############addTrayType: 同步打托数据开始"); + + //查询需要同步的仓库 + List 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; + } + + } 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 fbd293edc..7b3653e26 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 @@ -9,4 +9,6 @@ public interface ISyncOrderInfoService { void syncTrayType(Integer oldWarehouseId,Long newWarehouseId); + void addTrayType(Integer oldWarehouseId, Long newWarehouseId); + } 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 3b736387a..6a3400cba 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 @@ -78,14 +78,14 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { continue; } //查询订单是否在盘点任务中有被盘点到 - InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findOrderIsExist(orderCode); - if(!Objects.isNull(inventoryDetailEntity)){ +// InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findOrderIsExist(orderCode); +// 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 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 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); - if(Objects.isNull(inventoryDetailEntity)){ - log.info("###########saveTrayTypeInfoPackage: 包条不在盘点任务中存在，不同步 unitNo={}",unitNo); - continue; - } +// InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findUnitNoIsExist(unitNo); +// if(Objects.isNull(inventoryDetailEntity)){ +// log.info("###########saveTrayTypeInfoPackage: 包条不在盘点任务中存在，不同步 unitNo={}",unitNo); +// 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 orderDetailList = orderDetailClient.findByOrderCode(orderCode,oldWarehouseId); for (OrderDetailEntity orderDetailEntity:orderDetailList){ String unitNo = orderDetailEntity.getUnitNo(); - InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findUnitNoIsExist(unitNo); - if(Objects.isNull(inventoryDetailEntity)){ - log.info("###########saveOrderPackage: 包条不在盘点任务中存在，不同步 unitNo={}",unitNo); - continue; - } +// InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findUnitNoIsExist(unitNo); +// if(Objects.isNull(inventoryDetailEntity)){ +// log.info("###########saveOrderPackage: 包条不在盘点任务中存在，不同步 unitNo={}",unitNo); +// continue; +// } DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(unitNo); if(!Objects.isNull(parcelListEntity)){ log.info("###########saveOrderPackage: 包条已存在，不同步 unitNo={}",unitNo);