From ee97a36df1b18716f17920c60fe5553debb688bd Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 13 Mar 2024 15:19:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=8C=85=E7=89=A9=E6=96=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=81=E9=85=8D=E9=80=81=E7=AD=BE=E6=94=B6=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=93=81BUG=E4=BF=AE=E5=A4=8D=E3=80=81=E8=87=AA?= =?UTF-8?q?=E6=8F=90=E8=AE=A2=E5=8D=95BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/feign/IBasicMaterialClient.java | 5 +++ .../controller/BasicMaterialController.java | 17 +++++++ .../basic/feign/BasicMaterialClient.java | 11 +++++ .../dto/DistributionStockArticleOweDTO.java | 1 + .../mapper/DistributionStockArticleMapper.xml | 4 ++ .../DistributionDeliveryListServiceImpl.java | 1 + .../impl/DistributionSignforServiceImpl.java | 5 ++- .../DistributionStockListServiceImpl.java | 44 ++++++++++++------- 8 files changed, 71 insertions(+), 17 deletions(-) diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java index 2bdbac92e..df99ecd9b 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java @@ -25,6 +25,8 @@ 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; + /** * 物料基础信息 Feign接口类 * @@ -84,4 +86,7 @@ public interface IBasicMaterialClient { @GetMapping(API_PREFIX+"/findEntityByName") BasicMaterialEntity findEntityByName(@RequestParam String productName); + + @GetMapping(API_PREFIX+"/findEntityByPid") + List findEntityByPid(@RequestParam Long pid); } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java index 88c2e8426..f83e833c8 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java @@ -90,6 +90,23 @@ public class BasicMaterialController extends BladeController { } + /** + * 查询子物料 + */ + @GetMapping("/findPidList") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入basicMaterial") + public R> findPidList(@ApiIgnore @RequestParam Map basicMaterial) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(basicMaterial, BasicMaterialEntity.class); + queryWrapper.orderByDesc("create_time"); + if (Func.isNotEmpty(basicMaterial.get("pid"))){ + queryWrapper.lambda().eq(BasicMaterialEntity::getPid, Long.parseLong((String) basicMaterial.get("pid"))); + } + List pages = basicMaterialService.list( queryWrapper); + return R.data(pages); + } + + /** * 物料基础信息 自定义分页 */ diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicMaterialClient.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicMaterialClient.java index 897466b9c..3015cc634 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicMaterialClient.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicMaterialClient.java @@ -31,6 +31,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.List; + /** * 物料基础信息 Feign实现类 * @@ -119,4 +121,13 @@ public class BasicMaterialClient implements IBasicMaterialClient { return one; } + /** + * @param pid + * @return + */ + @Override + public List findEntityByPid(Long pid) { + return basicMaterialService.list(Wrappers.query().lambda().eq(BasicMaterialEntity::getPid,pid)); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java index 8c8aecc11..d553d0a38 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java @@ -28,5 +28,6 @@ public class DistributionStockArticleOweDTO extends DistributionStockArticleEnti private String reservation; private String startDate; private String entDate; + private String isAll; private List warehouseIdList; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index bf1639cc0..102c7ff25 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -473,6 +473,8 @@ and ldsa.warehouse_entry_time between #{param.startDate} and #{param.entDate} + and ldsa.hand_quantity > 0 + and DATE(ldsa.warehouse_entry_time) = #{param.warehouseEntryTime} @@ -518,6 +520,8 @@ and ldsa.type_service like concat('%',#{param.typeService},'%') + and ldsa.type_service like concat('%',#{param.typeService},'%') + and ldsa.customer_name like concat('%',#{param.customerName},'%') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index db6e83031..0beb50a86 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -6842,6 +6842,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplquery().lambda() + DistributionStockListEntity one2 = this.getOne(Wrappers.query().lambda() .eq(ObjectUtil.isNotEmpty(distributionStockListDTO.getMaterialId()),DistributionStockListEntity::getMaterialId, distributionStockListDTO.getMaterialId()) .eq(DistributionStockListEntity::getPid, distributionStockListDTO.getId()) .eq(DistributionStockListEntity::getMarketId, distributionStockListDTO.getMarketId()) @@ -261,6 +261,8 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl materialByProductCode = basicMaterialClient.findEntityByPid(distributionStockListDTO.getId()); + if (Func.isEmpty(materialByProductCode)){ + a = materialByProductCode.size()+1; + } + basicMaterialEntity.setName(one.getDescriptionGoods()+"-"+a); + basicMaterialEntity.setProductCode(one.getCargoNumber()+"-"+a); basicMaterialEntity.setPackingSpecification(distributionStockListDTO.getCargoNorms()); basicMaterialEntity.setSku(distributionStockListDTO.getSku()); basicMaterialEntity.setPackageNum(distributionStockListDTO.getPackageNum() + ""); - basicMaterialEntity.setPackageNum(distributionStockListDTO.getPackageNum() + ""); basicMaterialEntity.setLogpmUnit(distributionStockListDTO.getCargoUnit()); - basicMaterialEntity.setPid(distributionStockListDTO.getMaterialId()); + basicMaterialEntity.setSpecification(distributionStockListDTO.getCargoNorms()); + basicMaterialEntity.setExtent("0"); + basicMaterialEntity.setBreadth("0"); + basicMaterialEntity.setAltitude("0"); + basicMaterialEntity.setVolume("0"); + basicMaterialEntity.setWeight("0"); + basicMaterialEntity.setPid(one.getMaterialId()); aLong = basicMaterialClient.addMaterial(basicMaterialEntity); }else { - aLong = materialByProductCode.getId(); + basicMaterialEntity = basicMaterialClient.getMaterialByProductCode(distributionStockListDTO.getCargoNumber()); + aLong = basicMaterialEntity.getId(); } if (Func.isNotEmpty(one)) { //生成新的库存品信息 @@ -309,6 +322,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl map = JSONObject.parseObject(JSONObject.toJSONString(stockListEntity), Map.class); + Map map = JSONObject.parseObject(JSONObject.toJSONString(stockListEntity), Map.class); map.put("id",disStockListDetailEntity.getId()); map.put("customerName",distributionReservationEntity.getConsignee()); map.put("customerTelephone",distributionReservationEntity.getDeliveryPhone());