diff --git a/src/main/java/com/gaotao/modules/api/entity/issueAndReturnVo/PurchaseOrderVo.java b/src/main/java/com/gaotao/modules/api/entity/issueAndReturnVo/PurchaseOrderVo.java index 9b6db65..ba4132e 100644 --- a/src/main/java/com/gaotao/modules/api/entity/issueAndReturnVo/PurchaseOrderVo.java +++ b/src/main/java/com/gaotao/modules/api/entity/issueAndReturnVo/PurchaseOrderVo.java @@ -56,4 +56,6 @@ public class PurchaseOrderVo { // 对象状态(与status可能一致,部分系统用于内部状态管理) private String objstate; + + private String authorizationRequired; } diff --git a/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java b/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java index bd9480c..af6acf7 100644 --- a/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java +++ b/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java @@ -289,6 +289,7 @@ public class PoServiceImpl extends ServiceImpl implemen handlingUnit.setStatusDb("ACTIVE"); handlingUnit.setFreezeFlag("N"); handlingUnit.setMergedFlag("N"); + handlingUnit.setReserveFlag("N"); handlingUnit.setInStockFlag("N".equals(inData.getNeedCheck())?"Y":"X"); handlingUnit.setOrderRef1(inData.getPoNo()); handlingUnit.setOrderRef2(inData.getReceiptNo()); diff --git a/src/main/java/com/gaotao/modules/warehouse/service/impl/IfsInventoryInitServiceImpl.java b/src/main/java/com/gaotao/modules/warehouse/service/impl/IfsInventoryInitServiceImpl.java index 41b2d25..0cc0908 100644 --- a/src/main/java/com/gaotao/modules/warehouse/service/impl/IfsInventoryInitServiceImpl.java +++ b/src/main/java/com/gaotao/modules/warehouse/service/impl/IfsInventoryInitServiceImpl.java @@ -80,6 +80,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService { handlingUnit.setStatus("ACTIVE"); handlingUnit.setStatusDb("ACTIVE"); handlingUnit.setFreezeFlag("N"); + handlingUnit.setReserveFlag("N"); handlingUnit.setMergedFlag("N"); handlingUnit.setInStockFlag("Y"); handlingUnit.setCreatedDate(new Date()); @@ -200,7 +201,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService { @Transactional public List createOtherInboundHandlingUnits(CreateHuRequestDto request) { List unitIds = new ArrayList<>(); - + // 根据包装数创建多个HandlingUnit for (int i = 0; i < request.getPackageCount(); i++) { // 生成处理单元ID @@ -256,7 +257,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService { handlingUnit.setWidth(width); handlingUnit.setLength(length); - + // 设置生产日期和失效日期 if (request.getManufactureDate() != null) { handlingUnit.setManufactureDate(request.getManufactureDate()); @@ -264,9 +265,9 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService { if (request.getExpiredDate() != null) { handlingUnit.setExpiredDate(request.getExpiredDate()); } - + handlingUnit.setUmId(request.getUmid()); - + // 设置备注 if (request.getRemark() != null && !request.getRemark().trim().isEmpty()) { handlingUnit.setRemark(request.getRemark());