diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java index 5e94de56..3e8c3aea 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java @@ -535,7 +535,7 @@ public class NormalOrderController extends BaseController { .setSupplierCode(supplier.getSupplierCode()) .setSupplierId(it.getSupplierId()) .setSupplierName(supplier.getSupplierName()) - .setBatchNo(NoUtil.getBatchNo(supplier.getSupplierCode())) + .setBatchNo(it.getBatchNo()) .setCreateUserName(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()) ); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialMinQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialMinQO.java index cc31cc23..a551546c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialMinQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialMinQO.java @@ -29,4 +29,10 @@ public class MaterialMinQO { */ @NotNull private Integer count; + + /** + * 批次号 + */ + @NotBlank(message = "批次号不能为空") + private String batchNo; }