成品发货记录后端代码修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java

@@ -151,9 +151,9 @@ public class DeliverRecordMainController {
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(30, available);
         String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
-        mapDropDown.put(35, inventoryStatus);
+        mapDropDown.put(33, inventoryStatus);
         String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
-        mapDropDown.put(57, uom);
+        mapDropDown.put(55, uom);
         List<DeliverRecordMainExcelVO> resultList = new ArrayList<>();
         // 导出
         for(DeliverRecordMainDO mainDO : list) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailExportReqVO.java

@@ -109,4 +109,7 @@ public class DeliverRecordDetailExportReqVO {
     @Schema(description = "任务明细ID")
     private String jobDetailId;
 
+    @Schema(description = "主表ID")
+    private String masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailPageReqVO.java

@@ -111,4 +111,7 @@ public class DeliverRecordDetailPageReqVO extends PageParam {
     @Schema(description = "任务明细ID")
     private String jobDetailId;
 
+    @Schema(description = "主表ID")
+    private String masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordMainExcelVO.java

@@ -129,11 +129,11 @@ public class DeliverRecordMainExcelVO {
     @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String available;
 
-    @ExcelProperty("销售订单号")
-    private String soNumber;
-
-    @ExcelProperty("销售订单行")
-    private String soLine;
+//    @ExcelProperty("销售订单号")
+//    private String soNumber;
+//
+//    @ExcelProperty("销售订单行")
+//    private String soLine;
 
     @ExcelProperty("包装号")
     private String packingNumber;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRecord/DeliverRecordDetailMapper.java

@@ -22,6 +22,7 @@ public interface DeliverRecordDetailMapper extends BaseMapperX<DeliverRecordDeta
 
     default PageResult<DeliverRecordDetailDO> selectPage(DeliverRecordDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<DeliverRecordDetailDO>()
+                .eqIfPresent(DeliverRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(DeliverRecordDetailDO::getSoNumber, reqVO.getSoNumber())
                 .eqIfPresent(DeliverRecordDetailDO::getSoLine, reqVO.getSoLine())
                 .eqIfPresent(DeliverRecordDetailDO::getPackingNumber, reqVO.getPackingNumber())
@@ -60,6 +61,7 @@ public interface DeliverRecordDetailMapper extends BaseMapperX<DeliverRecordDeta
     }
     default List<DeliverRecordDetailDO> selectList(DeliverRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<DeliverRecordDetailDO>()
+                .eqIfPresent(DeliverRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(DeliverRecordDetailDO::getSoNumber, reqVO.getSoNumber())
                 .eqIfPresent(DeliverRecordDetailDO::getSoLine, reqVO.getSoLine())
                 .eqIfPresent(DeliverRecordDetailDO::getPackingNumber, reqVO.getPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java

@@ -109,7 +109,7 @@ public class DeliverRecordMainServiceImpl implements DeliverRecordMainService {
             return  deliverRecordMainDO;
         }
         else{
-            throw exception(DELIVER_RECORD_DETAIL_EXCEPTION,"单据号" + pnumber + "无效");
+            throw exception(DELIVER_RECORD_DETAIL_EXCEPTION,"发货记录单号" + pnumber + "无效");
         }
     }
     @Override