diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 42cc33424..9057e84cf 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -1258,7 +1258,20 @@ public class StockInOrderApplicationService { d.setMaterialBaseInfoId(materialBaseInfoId); // 设置商品名称和料号(从Excel读取) d.setMaterialName(r.getMaterialName()); - d.setMaterialCode(r.getMaterialCode()); + // 如果料号为空但物料ID有值,根据物料ID查询并补充料号 + String materialCode = r.getMaterialCode(); + if (StringUtils.isBlank(materialCode) && materialBaseInfoId != null) { + try { + MaterialBaseInfoPO materialBaseInfo = materialBaseInfoService.getInfo(materialBaseInfoId); + if (materialBaseInfo != null && StringUtils.isNotBlank(materialBaseInfo.getMaterialCode())) { + materialCode = materialBaseInfo.getMaterialCode(); + log.info("根据物料ID自动补充料号,物料ID: {}, 料号: {}", materialBaseInfoId, materialCode); + } + } catch (Exception e) { + log.warn("根据物料ID查询料号失败,物料ID: {}, 错误: {}", materialBaseInfoId, e.getMessage()); + } + } + d.setMaterialCode(materialCode); d.setQuantity(quantity); d.setSpecificationModel(r.getSpecificationModel()); d.setSkuCode(r.getSkuCode()); diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java index c7c00abdf..48f5bfd56 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java @@ -324,6 +324,10 @@ public class InMaterialDetailDTO extends BaseVOEntity { @Excel(name = "件数") private BigDecimal pieceCount; + @ApiModelProperty("入库数量(输入大于等于0的数字,可以为小数)") + @Excel(name = "入库数量") + private BigDecimal inboundQuantity; + @ApiModelProperty("出库数量(输入大于等于0的数字,可以为小数)") @Excel(name = "出库数量") private BigDecimal outboundQuantity;