客户收货申请/记录后端代码修改

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;
+
 }

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;
 }

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);
 

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<Customer
 
     default PageResult<CustomerreceiptRequestDetailDO> selectPage(CustomerreceiptRequestDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<CustomerreceiptRequestDetailDO>()
+                .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<Customer
     }
     default List<CustomerreceiptRequestDetailDO> selectList(CustomerreceiptRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<CustomerreceiptRequestDetailDO>()
+                .eqIfPresent(CustomerreceiptRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(CustomerreceiptRequestDetailDO::getSoNumber, reqVO.getSoNumber())
                 .eqIfPresent(CustomerreceiptRequestDetailDO::getSoLine, reqVO.getSoLine())
                 .eqIfPresent(CustomerreceiptRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())

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();