From e4ad82703a33e9578d5c92b95e60e532dd65e9a8 Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 5 Dec 2023 08:33:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=94=B6=E8=B4=A7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7/=E8=AE=B0=E5=BD=95=E5=90=8E=E7=AB=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/CustomerreceiptRequestDetailExportReqVO.java | 3 +++ .../vo/CustomerreceiptRequestDetailPageReqVO.java | 2 ++ .../CustomerreceiptRequestDetailConvert.java | 1 + .../CustomerreceiptRequestDetailMapper.java | 2 ++ .../CustomerreceiptRequestMainServiceImpl.java | 1 + 5 files changed, 9 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailExportReqVO.java index fcfa3c21..002d77e2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailExportReqVO.java @@ -86,4 +86,7 @@ public class CustomerreceiptRequestDetailExportReqVO { @Schema(description = "到货主代码") private String toOwnerCode; + @Schema(description = "主表ID") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailPageReqVO.java index 478a4307..ef0b46b1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailPageReqVO.java @@ -88,4 +88,6 @@ public class CustomerreceiptRequestDetailPageReqVO extends PageParam { @Schema(description = "到货主代码") private String toOwnerCode; + @Schema(description = "主表ID") + private Long masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customerreceiptRequest/CustomerreceiptRequestDetailConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customerreceiptRequest/CustomerreceiptRequestDetailConvert.java index 9337eaf9..088affda 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customerreceiptRequest/CustomerreceiptRequestDetailConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customerreceiptRequest/CustomerreceiptRequestDetailConvert.java @@ -23,6 +23,7 @@ public interface CustomerreceiptRequestDetailConvert { CustomerreceiptRequestDetailConvert INSTANCE = Mappers.getMapper(CustomerreceiptRequestDetailConvert.class); CustomerreceiptRequestDetailDO convert(CustomerreceiptRequestDetailCreateReqVO bean); + CustomerreceiptRequestDetailCreateReqVO convertDoToVo(CustomerreceiptRequestDetailDO customerreceiptRequestDetailDO); CustomerreceiptRequestDetailDO convert(CustomerreceiptRequestDetailUpdateReqVO bean); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestDetailMapper.java index 29e24c6a..af91c6ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestDetailMapper.java @@ -22,6 +22,7 @@ public interface CustomerreceiptRequestDetailMapper extends BaseMapperX selectPage(CustomerreceiptRequestDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(CustomerreceiptRequestDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(CustomerreceiptRequestDetailDO::getSoNumber, reqVO.getSoNumber()) .eqIfPresent(CustomerreceiptRequestDetailDO::getSoLine, reqVO.getSoLine()) .eqIfPresent(CustomerreceiptRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) @@ -52,6 +53,7 @@ public interface CustomerreceiptRequestDetailMapper extends BaseMapperX selectList(CustomerreceiptRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(CustomerreceiptRequestDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(CustomerreceiptRequestDetailDO::getSoNumber, reqVO.getSoNumber()) .eqIfPresent(CustomerreceiptRequestDetailDO::getSoLine, reqVO.getSoLine()) .eqIfPresent(CustomerreceiptRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java index 0aa26956..83a52d07 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java @@ -111,6 +111,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq customerreceiptRequestDetailDO.setMasterId(customerreceiptRequestMain.getId()); customerreceiptRequestDetailDO.setNumber(number); } + customerreceiptRequestDetailMapper.insertBatch(subDOList); trendsApi.createTrends(requestsettingDO.getId(), "CustomerreceiptRequest", "增加了客户收货申请", TrendsTypeEnum.CREATE); // 返回 return customerreceiptRequestMain.getId();