From f7cf2bd13badf65f4c9c4fb5bbfab3437b53835e Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 28 Jun 2023 18:56:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A4=84=E7=90=86=E5=9C=A8=E5=BA=93=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E5=88=B0=E6=96=B0=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionParcelListEntity.java | 9 +++- .../feign/IDistributionParcelListClient.java | 4 +- .../IDistributionStockArticleClient.java | 3 ++ .../feign/IAdvanceDetailClient.java | 6 +-- .../vo/DistributionParcelListEntityVO.java | 7 ++++ .../feign/DistributionParcelListClient.java | 6 +++ .../feign/DistributionStockArticleClient.java | 6 +++ .../impl/PanFactoryDataServiceImpl.java | 42 +++++++++---------- .../oldproject/feign/AdvanceDetailClient.java | 5 +-- .../mapper/AdvanceDetailMapper.java | 2 +- .../oldproject/mapper/AdvanceDetailMapper.xml | 35 +++++++++------- .../service/IAdvanceDetailService.java | 3 +- .../impl/AdvanceDetailServiceImpl.java | 4 +- 13 files changed, 81 insertions(+), 51 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java index 9db7ca66c..2f01659f1 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java @@ -17,10 +17,9 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; @@ -81,6 +80,12 @@ public class DistributionParcelListEntity extends TenantEntity { */ @ApiModelProperty(value = "包条码") private String packetBarCode; + + @ApiModelProperty(value = "货区信息") + private String cargoTitle; + + @ApiModelProperty(value = "货架信息") + private String shelfTitle; /** * 货位信息 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java index f1ad1cf20..01267bc42 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java @@ -17,7 +17,6 @@ package com.logpm.distribution.feign; import com.logpm.distribution.entity.DistributionParcelListEntity; -import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -56,4 +55,7 @@ public interface IDistributionParcelListClient { @PostMapping(API_PREFIX+"/addBatch") boolean addBatch(@RequestBody List parcelListEntityList); + + @PostMapping(API_PREFIX+"/add") + boolean add(@RequestBody DistributionParcelListEntity entity); } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java index 4c37f7ea9..f3bba919a 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java @@ -53,4 +53,7 @@ public interface IDistributionStockArticleClient { @GetMapping(API_PREFIX + "/findByAdvanceId") DistributionStockArticleEntity findByAdvanceId(@RequestParam Integer advanceId); + + @PostMapping(API_PREFIX + "/saveOrUpdate") + void saveOrUpdate(DistributionStockArticleEntity distributionStockArticleEntity); } diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java index f2c1d5dbb..b079e44de 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java @@ -24,7 +24,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; -import java.util.List; import java.util.Map; /** @@ -72,8 +71,7 @@ public interface IAdvanceDetailClient { @GetMapping(API_PREFIX + "/getOneByUnitNo") AdvanceDetailEntity getOneByUnitNo(@RequestParam String unitNo); - @GetMapping(API_PREFIX + "/getListByOrderSelfNum") - List getListByOrderSelfNum(@RequestParam String orderSelfNum); + @GetMapping(API_PREFIX + "/getByUnitNo") + DistributionParcelListEntityVO getByUnitNo(@RequestParam String unitNo); - void getOneByUnitNo(); } diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/vo/DistributionParcelListEntityVO.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/vo/DistributionParcelListEntityVO.java index eff4d0a1a..e8d68664b 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/vo/DistributionParcelListEntityVO.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/vo/DistributionParcelListEntityVO.java @@ -18,6 +18,13 @@ public class DistributionParcelListEntityVO { */ @ApiModelProperty(value = "包条码") private String packetBarCode; + + @ApiModelProperty(value = "货区信息") + private String cargoTitle; + + @ApiModelProperty(value = "货架信息") + private String shelfTitle; + /** * 货位信息 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java index a9a07bfa7..9d876234a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java @@ -68,4 +68,10 @@ public class DistributionParcelListClient implements IDistributionParcelListClie return distributionParcelListService.saveBatch(parcelListEntityList); } + @Override + @PostMapping(API_PREFIX+"/add") + public boolean add(DistributionParcelListEntity entity) { + return distributionParcelListService.save(entity); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java index 106adcf1e..6f6859763 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java @@ -71,4 +71,10 @@ public class DistributionStockArticleClient implements IDistributionStockArticle return distributionStockArticleService.getOne(queryWrapper); } + @Override + @PostMapping(API_PREFIX + "/saveOrUpdate") + public void saveOrUpdate(DistributionStockArticleEntity distributionStockArticleEntity) { + distributionStockArticleService.saveOrUpdate(distributionStockArticleEntity); + } + } 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 1274e8a5b..1917baf80 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 @@ -36,6 +36,7 @@ import com.logpm.oldproject.feign.IAdvanceClient; import com.logpm.oldproject.feign.IAdvanceDetailClient; import com.logpm.oldproject.feign.IOrderClient; import com.logpm.oldproject.feign.IWarehouseClient; +import com.logpm.oldproject.vo.DistributionParcelListEntityVO; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -322,6 +323,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { //判断新系统是否有这条订单数据 DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleClient.findByAdvanceId(advanceId); + Long id = null; if(Objects.isNull(distributionStockArticleEntity)){ Date date = CommonUtil.StringToDate(operationTime); @@ -334,7 +336,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setWarehouseEntryTime(date); distributionStockArticleEntity.setTotalNumber(advanceEntity.getTotal()); distributionStockArticleEntity.setHandQuantity(0); - distributionStockArticleEntity.setCompleteSet(1);//TODO + distributionStockArticleEntity.setCompleteSet(1); distributionStockArticleEntity.setBrand(advanceEntity.getType()); String customerName = advanceEntity.getCustomerName();//客户名称 @@ -353,29 +355,27 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setGenre(1); distributionStockArticleEntity.setState(2); distributionStockArticleEntity.setAdvanceId(advanceId); - } - Long id = distributionStockArticleClient.addData(distributionStockArticleEntity); - if(id == 0){ - logger.warn("#################handleDataToPlatform: 保存订单信息失败 orderSelfNum={}",orderSelfNum); - throw new CustomerException(405,"保存订单信息失败"); + id = distributionStockArticleClient.addData(distributionStockArticleEntity); + if(id == 0){ + logger.warn("#################handleDataToPlatform: 保存订单信息失败 orderSelfNum={}",orderSelfNum); + throw new CustomerException(405,"保存订单信息失败"); + } + }else{ + id = distributionStockArticleEntity.getId(); } - //存入包件明细 + //查询包件信息数据 + DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo); + DistributionParcelListEntity entity = new DistributionParcelListEntity(); + BeanUtil.copyProperties(vo,entity); - - -// List parcelListEntityList = new ArrayList<>(); -// for (DistributionParcelListEntityVO vo:detailList){ -// DistributionParcelListEntity entity = new DistributionParcelListEntity(); -// BeanUtil.copyProperties(vo,entity); -// entity.setStockArticleId(id+""); -// parcelListEntityList.add(entity); -// } -// boolean b = distributionParcelListClient.addBatch(parcelListEntityList); -// if(!b){ -// logger.warn("#################handleDataToPlatform: 保存包件信息失败 orderSelfNum={}",orderSelfNum); -// throw new CustomerException(405,"保存包件信息失败"); -// } + boolean b = distributionParcelListClient.add(entity); + if(!b){ + logger.warn("#################handleDataToPlatform: 保存包件信息失败 orderSelfNum={}",orderSelfNum); + throw new CustomerException(405,"保存包件信息失败"); + } + distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity()+1); + distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity); logger.info("#################handleDataToPlatform: 数据处理完成"); }else{ diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java index c62a7d50a..a2657bd51 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java @@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; -import java.util.List; import java.util.Map; /** @@ -76,8 +75,8 @@ public class AdvanceDetailClient implements IAdvanceDetailClient { } @Override - public List getListByOrderSelfNum(String orderSelfNum) { - return advanceDetailService.getListByOrderSelfNum(orderSelfNum); + public DistributionParcelListEntityVO getByUnitNo(String UnitNo) { + return advanceDetailService.getByUnitNo(UnitNo); } } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.java index c37da4ec0..9a01d892b 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.java @@ -52,6 +52,6 @@ public interface AdvanceDetailMapper extends BaseMapper { Map getSupplyData(@Param("unitNo") String unitNo); - List getListByOrderSelfNum(@Param("orderSelfNum") String orderSelfNum); + DistributionParcelListEntityVO getByUnitNo(@Param("unitNo") String unitNo); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml index 866618c9a..022d8af90 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml @@ -87,23 +87,28 @@ - + select w.title warehouse, + od.unitNo packetBarCode, + c.title cargoTitle, + s.title shelfTitle, + l.title goodsAllocation, + t.tray_no pallet, + ad.firstPackName firsts, + ad.secondPackName `second`, + ad.thirdPackName thirdProduct, + ad.productCode material, + ad.mscsNum quantity, + ad.mctsTruck trainNumber from ht_order_detail od - left join ht_advance_detail ad on od.unitNo = ad.unitNo and ad.delete_time = 0 + left join ht_advance_detail ad on ad.unitNo = od.unitNo left join ht_warehouse w on w.id = od.now_warehouse_id - left join ht_location l on l.id = od.location_id - where od.detail_number = #{orderSelfNum} + left join ht_location l on od.location_id = l.id + left join ht_shelf s on l.shelf_id = s.id + left join ht_cargo c on s.cargo_id = c.id + left join ht_tray_scan_des tsd on tsd.unitNo = od.unitNo + left join ht_tray t on t.id = tsd.tray_id + where od.unitNo = #{unitNo} diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceDetailService.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceDetailService.java index ef9ea212a..90c4e5d1d 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceDetailService.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceDetailService.java @@ -19,7 +19,6 @@ package com.logpm.oldproject.service; import com.logpm.oldproject.entity.AdvanceDetailEntity; import com.logpm.oldproject.vo.DistributionParcelListEntityVO; -import java.util.List; import java.util.Map; /** @@ -37,6 +36,6 @@ public interface IAdvanceDetailService { AdvanceDetailEntity getOneByUnitNo(String unitNo); - List getListByOrderSelfNum(String orderSelfNum); + DistributionParcelListEntityVO getByUnitNo(String unitNo); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java index fbc6f6779..e12a2c209 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java @@ -60,8 +60,8 @@ public class AdvanceDetailServiceImpl implements IAdvanceDetailService { } @Override - public List getListByOrderSelfNum(String orderSelfNum) { - return advanceDetailMapper.getListByOrderSelfNum(orderSelfNum); + public DistributionParcelListEntityVO getByUnitNo(String unitNo) { + return advanceDetailMapper.getByUnitNo(unitNo); }