diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java index 7679f1f2..a5f43612 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java @@ -91,23 +91,12 @@ public class ProductionreceiptRecordMainController { private List getExcelVo(List list, Map mapDropDown) { String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); - mapDropDown.put(17, locationType); - mapDropDown.put(18, locationType); - String[] areaType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE); - mapDropDown.put(24, areaType); - mapDropDown.put(25, areaType); + mapDropDown.put(32, locationType); String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(26, trueFalse); - mapDropDown.put(27, trueFalse); - mapDropDown.put(28, trueFalse); - mapDropDown.put(29, trueFalse); - mapDropDown.put(30, trueFalse); - mapDropDown.put(31, trueFalse); - mapDropDown.put(32, trueFalse); - mapDropDown.put(33, trueFalse); - mapDropDown.put(34, trueFalse); - mapDropDown.put(35, trueFalse); - mapDropDown.put(36, trueFalse); + mapDropDown.put(19, trueFalse); + mapDropDown.put(20, trueFalse); + String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(49, uom); List resultList = new ArrayList<>(); // 导出 for(ProductionreceiptRecordMainDO mainDO : list) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailExportReqVO.java index 18d6ebe5..fc916e1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailExportReqVO.java @@ -112,4 +112,8 @@ public class ProductionreceiptRecordDetailExportReqVO { @Schema(description = "到货主代码") private String toOwnerCode; + @Schema(description = "主表ID") + private String masterId; + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailPageReqVO.java index 7c73c434..0582256b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailPageReqVO.java @@ -114,4 +114,7 @@ public class ProductionreceiptRecordDetailPageReqVO extends PageParam { @Schema(description = "到货主代码") private String toOwnerCode; + @Schema(description = "主表ID") + private String masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExcelVO.java index b65c670e..213d953b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExcelVO.java @@ -26,6 +26,9 @@ public class ProductionreceiptRecordMainExcelVO { @ExcelProperty("发料记录单号") private String issueRecordNumber; + @ExcelProperty("收料记录单号") + private String productionreceiptRecordNumber; + @ExcelProperty("任务单号") private String jobNumber; @@ -107,6 +110,9 @@ public class ProductionreceiptRecordMainExcelVO { @ExcelProperty("工位代码") private String workStationCode; + @ExcelProperty("供应商代码") + private String supplierCode; + @ExcelProperty("在途库库位") private String onTheWayLocationCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptRecord/ProductionreceiptRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptRecord/ProductionreceiptRecordDetailDO.java index 8e5ee5e2..6023dc68 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptRecord/ProductionreceiptRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptRecord/ProductionreceiptRecordDetailDO.java @@ -161,4 +161,9 @@ public class ProductionreceiptRecordDetailDO extends BaseDO { */ private String toOwnerCode; + /** + * 供应商代码 + */ + private String supplierCode; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordDetailMapper.java index 55bf5ff3..4e9bd6e5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordDetailMapper.java @@ -23,6 +23,7 @@ public interface ProductionreceiptRecordDetailMapper extends BaseMapperX selectPage(ProductionreceiptRecordDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(ProductionreceiptRecordDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(ProductionreceiptRecordDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) .eqIfPresent(ProductionreceiptRecordDetailDO::getWorkStationCode, reqVO.getWorkStationCode()) .eqIfPresent(ProductionreceiptRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode()) @@ -64,6 +65,7 @@ public interface ProductionreceiptRecordDetailMapper extends BaseMapperX selectList(ProductionreceiptRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(ProductionreceiptRecordDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(ProductionreceiptRecordDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) .eqIfPresent(ProductionreceiptRecordDetailDO::getWorkStationCode, reqVO.getWorkStationCode()) .eqIfPresent(ProductionreceiptRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode())