From bddc318a853c0e5c7914c0ea3f776af0c396036a Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sun, 12 Nov 2023 10:31:17 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8E=A8=E9=80=81=E6=95=B0=E6=8D=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=80=BB=E6=95=B0=E9=87=8F=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/oldproject/feign/IAdvanceClient.java | 10 ++-------- .../pan/service/impl/PanFactoryDataServiceImpl.java | 8 ++++++-- .../java/com/logpm/oldproject/feign/AdvanceClient.java | 5 +++++ .../com/logpm/oldproject/mapper/AdvanceMapper.java | 3 +++ .../java/com/logpm/oldproject/mapper/AdvanceMapper.xml | 6 ++++++ .../com/logpm/oldproject/service/IAdvanceService.java | 2 ++ .../oldproject/service/impl/AdvanceServiceImpl.java | 5 +++++ 7 files changed, 29 insertions(+), 10 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 f66963354..5e75d8f2e 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 @@ -94,12 +94,6 @@ public interface IAdvanceClient { @GetMapping(API_PREFIX + "/findAdvanceEntityByLogiBillNoAndOrderCode") List findAdvanceEntityByLogiBillNoAndOrderCode(@RequestParam String logiBillNo,@RequestParam String orderCode); - - - - - - - - + @GetMapping(API_PREFIX + "/getAdvanceList") + List getAdvanceList(@RequestParam String orderSelfNum); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index bb36192b3..382d53282 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -359,8 +359,11 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { throw new CustomerException(405, "未找到对应的订单信息"); } - - Integer total = advanceEntity.getTotal();//发货总数量 + List ls = advanceClient.getAdvanceList(orderSelfNum); + Integer total = 0;//发货总数量 + for (AdvanceEntity ad:ls){ + total = total + ad.getTotal(); + } Map supplyData = advanceDetailClient.getSupplyData(unitNo); String destinationWarehouse= ""; @@ -675,6 +678,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { }else{ DistributionParcelListEntity entity = new DistributionParcelListEntity(); BeanUtil.copyProperties(vo, entity); + entity.setQuantity(1); entity.setOrderPackageCode(vo.getPacketBarCode()); entity.setConditions(1); entity.setWarehouse(distributionStockArticleEntity.getWarehouse()); 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 d88dd8c1f..bc6f90465 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 @@ -90,4 +90,9 @@ public class AdvanceClient implements IAdvanceClient { public List findAdvanceEntityByLogiBillNoAndOrderCode(String logiBillNo, String orderCode) { return service.findAdvanceEntityByLogiBillNoAndOrderCode(logiBillNo,orderCode); } + + @Override + public List getAdvanceList(String orderSelfNum) { + return service.getAdvanceList(orderSelfNum); + } } 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 5ce389720..aeee18ca6 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 @@ -50,4 +50,7 @@ public interface AdvanceMapper { List getEntityByMctsTruck(@Param("orderSelfNum") String orderSelfNum, @Param("mctsTruck") String mctsTruck); List findAdvanceEntityByLogiBillNoAndOrderCode(@Param("logiBillNo") String logiBillNo, @Param("orderCode")String orderCode); + + List getAdvanceList(@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 3666b0b22..97bada10e 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 @@ -61,5 +61,11 @@ SELECT adv.* from ht_advance adv LEFT JOIN ht_waybill_order wo on wo.advance_id=adv.id where wo.waybill_no =#{logiBillNo} and wo.orderSelfNum=#{orderCode} and wo.status !=-1 + 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 fa3053f58..a97ddbc04 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 @@ -50,4 +50,6 @@ public interface IAdvanceService { * @return */ List findAdvanceEntityByLogiBillNoAndOrderCode(String logiBillNo, String orderCode); + + List getAdvanceList(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 2371f9481..bd4729bab 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 @@ -74,4 +74,9 @@ public class AdvanceServiceImpl implements IAdvanceService { public List findAdvanceEntityByLogiBillNoAndOrderCode(String logiBillNo, String orderCode) { return advanceMapper.findAdvanceEntityByLogiBillNoAndOrderCode(logiBillNo,orderCode); } + + @Override + public List getAdvanceList(String orderSelfNum) { + return advanceMapper.getAdvanceList(orderSelfNum); + } }