diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java index 1a8aa048..d3354aad 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java @@ -339,7 +339,7 @@ public class InProduceOrderSurplusController extends BaseController { .stream() .map(list -> new InventoryInDTO() .setMaterialNo(list.get(0).getMaterialNo()) - .setOrder(100) + .setOrder(1000000) .setBatchNo(list.get(0).getBatchNo()) .setSerialNo(list.get(0).getSerialNo()) .setFactoryNo(list.get(0).getFactoryNo()) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java index aa90ec76..1df0237c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.dto; +import cn.hutool.core.util.StrUtil; import lombok.Data; import lombok.experimental.Accessors; @@ -62,10 +63,17 @@ public class InventoryInDTO { */ private Integer order; + public Integer getOrder() { + if (Objects.isNull(order) && StrUtil.isNotBlank(getBatchNo())) { + return Integer.parseInt(getBatchNo().substring(4)); + } + return order; + } + private String key; public String getKey() { return getMaterialNo() + "|" + getFactoryNo() + "|" + getWarehouseNo() + "|" + getBatchNo() + "|" - + getSerialNo() + "|" + order + "|" + getBinLocation(); + + getSerialNo() + "|" + getOrder() + "|" + getBinLocation(); } }