Browse Source

审核

master
han\hanst 8 months ago
parent
commit
903f8d2d6e
  1. 2
      src/main/java/com/gaotao/modules/api/entity/issueAndReturnVo/PurchaseOrderVo.java
  2. 1
      src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java
  3. 9
      src/main/java/com/gaotao/modules/warehouse/service/impl/IfsInventoryInitServiceImpl.java

2
src/main/java/com/gaotao/modules/api/entity/issueAndReturnVo/PurchaseOrderVo.java

@ -56,4 +56,6 @@ public class PurchaseOrderVo {
// 对象状态与status可能一致部分系统用于内部状态管理 // 对象状态与status可能一致部分系统用于内部状态管理
private String objstate; private String objstate;
private String authorizationRequired;
} }

1
src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java

@ -289,6 +289,7 @@ public class PoServiceImpl extends ServiceImpl<PoMapper, PurchaseOrder> implemen
handlingUnit.setStatusDb("ACTIVE"); handlingUnit.setStatusDb("ACTIVE");
handlingUnit.setFreezeFlag("N"); handlingUnit.setFreezeFlag("N");
handlingUnit.setMergedFlag("N"); handlingUnit.setMergedFlag("N");
handlingUnit.setReserveFlag("N");
handlingUnit.setInStockFlag("N".equals(inData.getNeedCheck())?"Y":"X"); handlingUnit.setInStockFlag("N".equals(inData.getNeedCheck())?"Y":"X");
handlingUnit.setOrderRef1(inData.getPoNo()); handlingUnit.setOrderRef1(inData.getPoNo());
handlingUnit.setOrderRef2(inData.getReceiptNo()); handlingUnit.setOrderRef2(inData.getReceiptNo());

9
src/main/java/com/gaotao/modules/warehouse/service/impl/IfsInventoryInitServiceImpl.java

@ -80,6 +80,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService {
handlingUnit.setStatus("ACTIVE"); handlingUnit.setStatus("ACTIVE");
handlingUnit.setStatusDb("ACTIVE"); handlingUnit.setStatusDb("ACTIVE");
handlingUnit.setFreezeFlag("N"); handlingUnit.setFreezeFlag("N");
handlingUnit.setReserveFlag("N");
handlingUnit.setMergedFlag("N"); handlingUnit.setMergedFlag("N");
handlingUnit.setInStockFlag("Y"); handlingUnit.setInStockFlag("Y");
handlingUnit.setCreatedDate(new Date()); handlingUnit.setCreatedDate(new Date());
@ -200,7 +201,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService {
@Transactional @Transactional
public List<String> createOtherInboundHandlingUnits(CreateHuRequestDto request) { public List<String> createOtherInboundHandlingUnits(CreateHuRequestDto request) {
List<String> unitIds = new ArrayList<>(); List<String> unitIds = new ArrayList<>();
// 根据包装数创建多个HandlingUnit // 根据包装数创建多个HandlingUnit
for (int i = 0; i < request.getPackageCount(); i++) { for (int i = 0; i < request.getPackageCount(); i++) {
// 生成处理单元ID // 生成处理单元ID
@ -256,7 +257,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService {
handlingUnit.setWidth(width); handlingUnit.setWidth(width);
handlingUnit.setLength(length); handlingUnit.setLength(length);
// 设置生产日期和失效日期 // 设置生产日期和失效日期
if (request.getManufactureDate() != null) { if (request.getManufactureDate() != null) {
handlingUnit.setManufactureDate(request.getManufactureDate()); handlingUnit.setManufactureDate(request.getManufactureDate());
@ -264,9 +265,9 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService {
if (request.getExpiredDate() != null) { if (request.getExpiredDate() != null) {
handlingUnit.setExpiredDate(request.getExpiredDate()); handlingUnit.setExpiredDate(request.getExpiredDate());
} }
handlingUnit.setUmId(request.getUmid()); handlingUnit.setUmId(request.getUmid());
// 设置备注 // 设置备注
if (request.getRemark() != null && !request.getRemark().trim().isEmpty()) { if (request.getRemark() != null && !request.getRemark().trim().isEmpty()) {
handlingUnit.setRemark(request.getRemark()); handlingUnit.setRemark(request.getRemark());

Loading…
Cancel
Save