From f31a06b137395d9748e4ecbe22e67a40139391f7 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Thu, 19 Oct 2023 10:58:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/entity/QuestDetailEntity.java | 4 +++ .../com/logpm/warehouse/vo/QuestDetailVO.java | 29 ++++++++++++++++++- .../controller/TaskQuestController.java | 8 ++--- .../warehouse/mapper/TaskQuestMapper.xml | 23 +++++++++++---- .../warehouse/service/ITaskQuestService.java | 6 ++-- .../service/impl/TaskQuestServiceImpl.java | 6 ++-- 6 files changed, 60 insertions(+), 16 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java index 5713d1aeb..2669c6ad3 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java @@ -168,21 +168,25 @@ public class QuestDetailEntity extends TenantEntity { /** * 物料编码 */ + @ApiModelProperty(value = "物料编码") private String materialCode; /** * 物料名称 */ + @ApiModelProperty(value = "物料名称") private String materialName; /** * 商场名称 */ + @ApiModelProperty(value = "商场名称") private String marketName; /** * 批次号 */ + @ApiModelProperty(value = "批次号") private String incomingBatch; diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java index c7e952057..7ec2b8e0d 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java @@ -114,11 +114,38 @@ public class QuestDetailVO extends QuestDetailEntity { /** * 收货单位 */ - @ApiModelProperty(value = "发站仓") + @ApiModelProperty(value = "收货单位") private String consigneeUnit; /* ----------- 库存品 --------------------- */ + /* ----------- 零担 --------------------- */ + + /** + * 运单号 + */ + @ApiModelProperty(value = "运单号") + private String waybillNumber; + + /** + * 运单收货人 + */ + @ApiModelProperty(value = "运单收货人") + private String consigneePerson; + + /** + * 运单收货地址 + */ + @ApiModelProperty(value = "运单收货地址") + private String consigneeAddress; + + /** + * 运单收货电话 + */ + @ApiModelProperty(value = "运单收货电话") + private String consigneeMobile; + + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java index 58910dc01..0473a8286 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java @@ -82,7 +82,7 @@ public class TaskQuestController extends BladeController { @ApiOperationSupport(order = 1) @ApiOperation(value = "盘点任务 任务下的包条", notes = "传入taskQuest") public R> SelectStrip(Long id, Query query) { - IPage list = taskQuestService.SelectStrip(Condition.getPage(query),id); + IPage list = taskQuestService.selectStrip(Condition.getPage(query),id); return R.data(list); } @@ -93,7 +93,7 @@ public class TaskQuestController extends BladeController { @ApiOperationSupport(order = 1) @ApiOperation(value = "盘点任务 任务下的库存品", notes = "传入id") public R> SelectInventory(Long id,Query query) { - IPage list = taskQuestService.SelectInventory(Condition.getPage(query),id); + IPage list = taskQuestService.selectInventory(Condition.getPage(query),id); return R.data(list); } @@ -102,9 +102,9 @@ public class TaskQuestController extends BladeController { */ @GetMapping("/SelectZreo") @ApiOperationSupport(order = 1) - @ApiOperation(value = "盘点任务 任务下的库存品", notes = "传入id") + @ApiOperation(value = "盘点任务 任务下的零担", notes = "传入id") public R> SelectZero(Long id,Query query) { - IPage list = taskQuestService.SelectZero(Condition.getPage(query),id); + IPage list = taskQuestService.selectZero(Condition.getPage(query),id); return R.data(list); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml index 69983cb50..560233460 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml @@ -164,6 +164,7 @@ ldpl.third_product thirdProduct, ldpl.material_name materialName, ldpl.brand_name brandName, + ldpl.send_warehouse_name sendWarehouseName, ldsa.consignee_unit consigneeUnit FROM logpm_quest_detail lqd @@ -183,6 +184,7 @@ lqd.material_code materialCode, lqd.market_name marketName, lqd.incoming_batch incomingBatch, + lqd.update_time updateTime, lqd.position_code positionCode, lqd.material_name materialName, ldsl.service_number serviceNumber, @@ -190,7 +192,6 @@ FROM logpm_quest_detail lqd JOIN logpm_distribution_stock_list ldsl ON lqd.stock_id = ldsl.id - AND lqd.incoming_batch = ldsl.incoming_batch AND lqd.quest_target =3 lqd.is_deleted =0 and lqd.quest_id = #{questId} @@ -198,11 +199,23 @@ + + diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IInventoryDetailService.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IInventoryDetailService.java index c1f283851..7868d177e 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IInventoryDetailService.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IInventoryDetailService.java @@ -2,10 +2,14 @@ package com.logpm.oldproject.service; import com.logpm.oldproject.entity.InventoryDetailEntity; +import java.util.List; + public interface IInventoryDetailService { InventoryDetailEntity findOrderIsExist(String orderCode); InventoryDetailEntity findUnitNoIsExist(String unitNo); + + List findAllTrayType(); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/ITrayScanDesService.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/ITrayScanDesService.java index 02b0bb586..d1a838314 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/ITrayScanDesService.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/ITrayScanDesService.java @@ -8,4 +8,6 @@ public interface ITrayScanDesService { List findListByOrderCodeAndWarehouseId(String orderCode, Integer oldWarehouseId); List findZeroListByOrderCodeAndWarehouseId(String orderCode, Integer oldWarehouseId); + + TrayScanDesEntity findScanTypeId(Integer trayId, String unitNo, Integer oldWarehouseId); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/InventoryDetailServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/InventoryDetailServiceImpl.java index f99700acc..93a4b3934 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/InventoryDetailServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/InventoryDetailServiceImpl.java @@ -6,6 +6,8 @@ import com.logpm.oldproject.service.IInventoryDetailService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + @Service @AllArgsConstructor public class InventoryDetailServiceImpl implements IInventoryDetailService { @@ -21,4 +23,9 @@ public class InventoryDetailServiceImpl implements IInventoryDetailService { public InventoryDetailEntity findUnitNoIsExist(String unitNo) { return inventoryDetailMapper.findUnitNoIsExist(unitNo); } + + @Override + public List findAllTrayType() { + return inventoryDetailMapper.findAllTrayType(); + } } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/TrayScanDesServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/TrayScanDesServiceImpl.java index f7b1d9dbe..9f04c9eb1 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/TrayScanDesServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/TrayScanDesServiceImpl.java @@ -28,4 +28,14 @@ public class TrayScanDesServiceImpl implements ITrayScanDesService { public List findZeroListByOrderCodeAndWarehouseId(String orderCode, Integer oldWarehouseId) { return trayScanDesMapper.findZeroListByOrderCodeAndWarehouseId(orderCode,oldWarehouseId); } + + @Override + public TrayScanDesEntity findScanTypeId(Integer trayId, String unitNo, Integer oldWarehouseId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("now_warehouse_id",oldWarehouseId) + .eq("type",1) + .eq("tray_id",trayId) + .eq("unitNo",unitNo); + return trayScanDesMapper.selectOne(queryWrapper); + } } 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 2cc5b005f..84ce318b5 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 @@ -34,6 +34,7 @@ public class SyncOrderInfoToPlatform { private final IOrderSyncRecordService orderSyncRecordService; private final ISyncOrderInfoService syncOrderInfoService; + @XxlJob("syncOrderInfo") public ReturnT syncOrderInfo(String param) { @@ -223,4 +224,30 @@ public class SyncOrderInfoToPlatform { } + @XxlJob("syncTrayType") + public ReturnT syncTrayType(String param) { + log.info("############syncTrayType: 同步打托数据开始"); + + //查询需要同步的仓库 + List warehouseMappingDataEntityList = warehouseMappingDataService.getWarehouseMapping(); + if(warehouseMappingDataEntityList.isEmpty()){ + log.warn("###############syncZeroOrderInfo: 当前没有配置需要同步的仓库信息"); + return ReturnT.FAIL; + } + for (WarehouseMappingDataEntity entity:warehouseMappingDataEntityList){ + Integer oldWarehouseId = entity.getOldWarehouseId(); + Long newWarehouseId = entity.getNewWarehouseId(); + + syncOrderInfoService.syncTrayType(oldWarehouseId,newWarehouseId); + } + + return ReturnT.SUCCESS; + } + +// @XxlJob("syncEntryTime") +// public ReturnT syncTrayType(String param) { +// +// } + + } 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 5197ed848..fbd293edc 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 @@ -6,4 +6,7 @@ public interface ISyncOrderInfoService { void handleData(List orderCodeList,Integer oldWarehouseId,Long newWarehouseId); void handleDataZero(List orderCodeList, Integer oldWarehouseId, Long newWarehouseId); + + void syncTrayType(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 8f51ff71d..0db411df3 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 @@ -122,6 +122,13 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { } } + @Override + public void syncTrayType(Integer oldWarehouseId,Long newWarehouseId) { + + saveTrayTypeInfoPackageNew(oldWarehouseId,newWarehouseId); + + } + private void saveTrayTypeInfoPackage(String orderCode,Integer oldWarehouseId,Long newWarehouseId) { //如果是订制品就先查询该订单有哪些包件打了托 @@ -995,4 +1002,60 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { return wayBillEntity; } + + private void saveTrayTypeInfoPackageNew(Integer oldWarehouseId, Long newWarehouseId) { + + + List ls = inventoryDetailClient.findAllTrayType(); + for (InventoryDetailEntity entity:ls){ + + Integer trayId = entity.getTrayId(); + String unitNo = entity.getUnitNo();//包条码 + + TrayScanDesEntity trayScanDesEntity = trayScanDesClient.findScanTypeId(trayId,unitNo,oldWarehouseId); + Integer trayScanId = trayScanDesEntity.getTrayScanId(); + + InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findUnitNoIsExist(unitNo); + if(Objects.isNull(inventoryDetailEntity)){ + log.info("###########saveTrayTypeInfoPackage: 包条不在盘点任务中存在，不同步 unitNo={}",unitNo); + continue; + } + //查询打托方式信息 + TrayScanEntity trayScanEntity = trayScanClient.getEntityByTrayScanId(trayScanId); + Integer type = trayScanEntity.getType(); + + //方式：1=仓，2=商场，3=客户，4=其他,5=服务号，6=合同号 + //方式：60=仓，30=商场，50=客户，100=其他,10=服务号，20=合同号 + String newTrayType = "100"; + if(1==type){ + newTrayType = "60"; + }else if(2==type){ + newTrayType = "30"; + }else if(3==type){ + newTrayType = "50"; + }else if(4==type){ + newTrayType = "100"; + }else if(5==type){ + newTrayType = "10"; + }else if(6==type){ + newTrayType = "20"; + } + + Map map = new HashMap<>(); + map.put("trayType",newTrayType); + map.put("trayCode","T"+trayId); + map.put("warehouseId",newWarehouseId); + map.put("orderPackageCode",unitNo); + + //新系统保存打托方式 + boolean b = warehouseTrayTypeClient.orderScanOrderPackageCode(map); + + if(!b){ + log.error("################saveTrayTypeInfo: 包件打托失败 unitNo={} trayCode={}",unitNo,"T"+trayId); + throw new CustomerException(403,"包件打托失败"); + } + } + } + + }