2025-09-28

pda 其它入库 其它出库

src/main/java/com/gaotao/modules/api/service/impl/IfsApiIssueAndReturnServiceImpl.java

@@ -318,7 +318,7 @@ public class IfsApiIssueAndReturnServiceImpl implements IfsApiIssueAndReturnServ
             params.put("ifsSerialNo", otherTransactionIfsDto.getIfsSerialNo());
             params.put("ifsEngChgLevel", otherTransactionIfsDto.getIfsEngChgLevel());
             params.put("ifsWdrNo", otherTransactionIfsDto.getIfsWdrNo());
-            params.put("ifsHandlingUntitID", otherTransactionIfsDto.getIfsHandlingUntitID());
+            params.put("ifsHandlingUntiID", otherTransactionIfsDto.getIfsHandlingUnitID());
             params.put("ifsQtyReceived", otherTransactionIfsDto.getIfsQuantity());
             params.put("ifsPartOwnershipDb", "COMPANY OWNED");
 
@@ -348,7 +348,7 @@ public class IfsApiIssueAndReturnServiceImpl implements IfsApiIssueAndReturnServ
             params.put("ifsWdrNo", otherTransactionIfsDto.getIfsWdrNo());
             params.put("ifsEngChgLevel", otherTransactionIfsDto.getIfsEngChgLevel());
             params.put("ifsActivitySeq", otherTransactionIfsDto.getIfsActivitySeq());
-            params.put("ifsHandlingUntitID", otherTransactionIfsDto.getIfsHandlingUntitID());
+            params.put("ifsHandlingUntiID", otherTransactionIfsDto.getIfsHandlingUnitID());
             params.put("ifsQuantity", otherTransactionIfsDto.getIfsQuantity());
             params.put("ifsTransactionType", otherTransactionIfsDto.getIfsTransactionType());
             params.put("ifsReason", otherTransactionIfsDto.getIfsReason());

src/main/java/com/gaotao/modules/other/entity/OtherTransactionIfsDto.java

@@ -19,7 +19,7 @@ public class OtherTransactionIfsDto {
     private String ifsWdrNo;
     private String ifsEngChgLevel;
     private BigDecimal ifsActivitySeq;
-    private BigDecimal ifsHandlingUntitID;
+    private BigDecimal ifsHandlingUnitID;
     private BigDecimal ifsQuantity;
     private String ifsTransactionType; // IN/OUT
     private String ifsReason; // 操作原因

src/main/java/com/gaotao/modules/other/service/impl/OtherInboundServiceImpl.java

@@ -96,7 +96,7 @@ public class OtherInboundServiceImpl implements OtherInboundService {
                 ifsDto.setIfsSerialNo("*");
                 ifsDto.setIfsWdrNo(detail.getWdrNo());
                 ifsDto.setIfsEngChgLevel("1");
-                ifsDto.setIfsHandlingUntitID(BigDecimal.ZERO);
+                ifsDto.setIfsHandlingUnitID(BigDecimal.ZERO);
                 ifsDto.setIfsQuantity(detail.getTransQty());
 
                 try {
@@ -155,7 +155,7 @@ public class OtherInboundServiceImpl implements OtherInboundService {
             }
             
             // 检查HandlingUnit状态
-            if (!"AVAILABLE".equals(hu.getStatus()) && !"A".equals(hu.getStatusDb())) {
+            if (!"X".equals(hu.getInStockFlag())) {
                 throw new XJException("HandlingUnit状态不可用: " + unitId);
             }
             
@@ -195,7 +195,7 @@ public class OtherInboundServiceImpl implements OtherInboundService {
             subDto.setLocationId(dto.getTargetLocationId()); // 使用目标库位
             subDto.setTransQty(hu.getQty().toString());
             subDto.setDirection("+"); // 入库方向
-            subDto.setWdrNo("*");
+            subDto.setWdrNo(hu.getWdr() == null ? "*" : hu.getWdr());
             
             subList.add(subDto);
         }
@@ -238,6 +238,7 @@ public class OtherInboundServiceImpl implements OtherInboundService {
         List<TransDetailSub> detailSubs = new ArrayList<>();
         
         //保存sub
+        double seqNo = 1.0;
         for (OtherInboundTransSubDto subDto : dto.getSubList()){
             TransDetailSub detailSub = new TransDetailSub();
             detailSub.setSite(dto.getSite());
@@ -251,6 +252,7 @@ public class OtherInboundServiceImpl implements OtherInboundService {
             detailSub.setLocationId(subDto.getLocationId());
             detailSub.setOrderRef3(subDto.getWdrNo());
             detailSub.setOrderRef4(subDto.getWarehouseId());
+            detailSub.setSeqNo(seqNo++);
 
             // 更新HandlingUnit状态
             HandlingUnit handlingUnit = handlingUnitService.lambdaQuery()

src/main/java/com/gaotao/modules/other/service/impl/OtherOutboundServiceImpl.java

@@ -160,9 +160,9 @@ public class OtherOutboundServiceImpl implements OtherOutboundService {
             }
             
             // 检查HandlingUnit状态
-            if (!"AVAILABLE".equals(hu.getStatus()) && !"A".equals(hu.getStatusDb())) {
-                throw new XJException("HandlingUnit状态不可用: " + unitId);
-            }
+//            if (!"AVAILABLE".equals(hu.getStatus()) && !"A".equals(hu.getStatusDb())) {
+//                throw new XJException("HandlingUnit状态不可用: " + unitId);
+//            }
 
             // 检查是否在库
             if (!"Y".equals(hu.getInStockFlag())) {