From 34d9feab2ee44692bf164449ef307af59e09ca79 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 22 Jul 2024 19:19:45 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D=202.p?= =?UTF-8?q?atch=E5=90=8C=E6=AD=A5=E8=AE=A2=E5=8D=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E5=BE=AA=E7=8E=AF=E6=9F=A5=E8=AF=A2=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E4=BB=93=E8=BF=90=E5=8D=95bug=E4=BF=AE=E5=A4=8D=203.=E5=BA=93?= =?UTF-8?q?=E5=86=85=E8=B4=A7=E6=9E=B6=EF=BC=8C=E5=BA=93=E4=BD=8Dbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oldproject/feign/IAdvanceClient.java | 5 ++++ .../feign/IAdvanceClientFallbackFactory.java | 6 ++++ .../logpm/trunkline/vo/SignOrderDetailVO.java | 1 + .../mapper/BasicdataGoodsAllocationMapper.xml | 3 ++ .../impl/BasicdataCodeServiceImpl.java | 2 +- .../logpm/oldproject/feign/AdvanceClient.java | 6 ++++ .../oldproject/mapper/AdvanceMapper.java | 2 ++ .../logpm/oldproject/mapper/AdvanceMapper.xml | 9 ++++++ .../oldproject/service/IAdvanceService.java | 2 ++ .../service/impl/AdvanceServiceImpl.java | 6 ++++ .../impl/SyncOrderInfoServiceImpl.java | 30 ++++++++++++------- .../mapper/TrunklineCarsLoadMapper.xml | 1 + .../mapper/TrunklineLoadSignOrderMapper.xml | 1 + .../impl/TrunklineCarsLoadServiceImpl.java | 25 ++++++++++++++++ 14 files changed, 87 insertions(+), 12 deletions(-) diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java index 701af6358..d427c1bb9 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java @@ -79,6 +79,11 @@ public interface IAdvanceClient { */ @GetMapping(API_PREFIX + "/queryDataOne") AdvanceEntity getQueryDataOne(@RequestParam String orderSelfNum); + + @GetMapping(API_PREFIX + "/getQueryDataList") + List getQueryDataList(@RequestParam String orderSelfNum); + + @GetMapping(API_PREFIX + "/getEntityByMctsTruck") List getEntityByMctsTruck(@RequestParam String orderSelfNum,@RequestParam String mctsTruck); diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClientFallbackFactory.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClientFallbackFactory.java index c9c0c05c8..a4ad8e9b7 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClientFallbackFactory.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClientFallbackFactory.java @@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; +import java.util.Collections; import java.util.List; @Slf4j @@ -36,6 +37,11 @@ public class IAdvanceClientFallbackFactory implements FallbackFactory getQueryDataList(String orderSelfNum) { + return Collections.emptyList(); + } + @Override public List getEntityByMctsTruck(String orderSelfNum, String mctsTruck) { return null; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/SignOrderDetailVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/SignOrderDetailVO.java index 2412eb77c..2888247ab 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/SignOrderDetailVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/SignOrderDetailVO.java @@ -22,6 +22,7 @@ public class SignOrderDetailVO implements Serializable { private Integer type; private Integer num; private Integer unloadNum; + private Integer signNum; private String signUserName; private Date signTime; private Date unloadTime; diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml index 7795d2c49..637f29826 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml @@ -115,6 +115,9 @@ and goods_allocation.enable_status = 1 + + and goods_allocation.enable_status = #{po.enableStatus} + AND goods_allocation.goods_area_id=#{po.goodsAreaId} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java index f13a262ec..81b0a5259 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java @@ -457,7 +457,7 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { basicdataCodeRecordEntity.setNum(inrc); basicdataCodeRecordService.updateById(basicdataCodeRecordEntity); - String trayCode = "T" + code + year + CommonUtil.geFourNumber(month.longValue(), 2) + inrc; + String trayCode = code + year + CommonUtil.geFourNumber(month.longValue(), 2) + inrc; String trayName = desName + abbreviation + inrc; return trayCode+"&&"+trayName; diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java index 6aa30181a..0390fa5b9 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.Collections; import java.util.List; /** @@ -84,6 +85,11 @@ public class AdvanceClient implements IAdvanceClient { } } + @Override + public List getQueryDataList(String orderSelfNum) { + return service.getQueryDataList(orderSelfNum); + } + @Override public List getEntityByMctsTruck(String orderSelfNum, String mctsTruck) { return service.getEntityByMctsTruck(orderSelfNum,mctsTruck); diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.java index 4de5b4b07..0b65714c8 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.java @@ -56,4 +56,6 @@ public interface AdvanceMapper { List findListByAdvanceIds(@Param("advanceIds") List advanceIds); List findListByWaybillNo(@Param("waybillNo") String waybillNo); + + List getQueryDataList(@Param("orderSelfNum") String orderSelfNum); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml index 5de72e1e8..f9438e33d 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml @@ -25,6 +25,15 @@ limit 1 + + INSERT INTO `ht_advance`( `orderSelfNum`, `siteName`, `area`, `orderTypeName`, `orderClassName`, `type`, `total`, `mtdsNo`, `firstPackName`, `firstPackCode`, `dealerCode`, `dealerName`, `dueDate`, `is_opai`, `orderNum`, `carrierName`, diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceService.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceService.java index 79353faa3..49d2a4a26 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceService.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceService.java @@ -56,4 +56,6 @@ public interface IAdvanceService { List findListByAdvanceIds(List advanceIds); List findListByWaybillNo(String waybillNo); + + List getQueryDataList(String orderSelfNum); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java index 3bc887d09..35997e451 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java @@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; /** @@ -92,4 +93,9 @@ public class AdvanceServiceImpl implements IAdvanceService { public List findListByWaybillNo(String waybillNo) { return advanceMapper.findListByWaybillNo(waybillNo); } + + @Override + public List getQueryDataList(String orderSelfNum) { + return advanceMapper.getQueryDataList(orderSelfNum); + } } 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 90f253a35..1b1b3f3c6 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 @@ -1433,12 +1433,27 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { private void saveOrderInfo(String orderCode, Integer oldWarehouseId, Long newWarehouseId,Integer inventoryId) { + Integer total = 0; //通过订单号查询暂存单 - AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderCode); - if(Objects.isNull(advanceEntity)){ - log.warn("#################saveOrderInfo: 未查询单订单信息 orderCode={}",orderCode); - throw new CustomerException(403,"未查询单订单信息"); + AdvanceEntity advanceEntity = null; + WayBillEntity wayBillEntity = null; + List advanceList = advanceClient.getAdvanceList(orderCode); + for (AdvanceEntity entity : advanceList) { + total = total + entity.getTotal(); + String waybillNo = entity.getWaybillNo(); + if(StringUtil.isNotBlank(waybillNo)){ + WayBillEntity wb = wayBillClient.getByWaybillNo(waybillNo); + if(Objects.isNull(wb)){ + Integer oWid = wb.getWarehouseId(); + if(oldWarehouseId.equals(oWid)){ + advanceEntity = advanceEntity; + wayBillEntity = wb; + break; + } + } + } } + Integer advanceId = advanceEntity.getId(); //判断新系统是否有这条订单数据 DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode,newWarehouseId); @@ -1449,13 +1464,6 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { throw new CustomerException(403,"未查询单订单信息"); } - Integer total = 0; - List advanceList = advanceClient.getAdvanceList(orderCode); - for (AdvanceEntity entity : advanceList) { - total = total + entity.getTotal(); - } - - WayBillEntity wayBillEntity = wayBillClient.getByWayBillByOrderCode(orderCode); if(Objects.isNull(wayBillEntity)){ log.warn("#################saveOrderInfo: 运单信息为空 orderCode={}",orderCode); throw new CustomerException(403,"运单信息为空"); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index b1bdda593..82cb63d0f 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -480,6 +480,7 @@