From 994a83e96cc2ef45cc5b3993107a89372cefe65f Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 4 Jul 2025 15:33:05 +0800
Subject: [PATCH] init

---
 .../modules/po/controller/PoController.java   |  6 ----
 .../modules/trans/entity/TransDetailDto.java  |  5 +++-
 .../trans/entity/TransDetailSubDto.java       |  9 ++++++
 .../trans/service/TransNoControlService.java  |  1 +
 .../service/impl/TransHeaderServiceImpl.java  | 29 ++++++++++++-------
 .../impl/TransNoControlServiceImpl.java       | 10 +++++++
 6 files changed, 43 insertions(+), 17 deletions(-)
 create mode 100644 src/main/java/com/gaotao/modules/trans/entity/TransDetailSubDto.java

diff --git a/src/main/java/com/gaotao/modules/po/controller/PoController.java b/src/main/java/com/gaotao/modules/po/controller/PoController.java
index 8a360ad..5ffa344 100644
--- a/src/main/java/com/gaotao/modules/po/controller/PoController.java
+++ b/src/main/java/com/gaotao/modules/po/controller/PoController.java
@@ -1,16 +1,10 @@
 package com.gaotao.modules.po.controller;
 
-
-import com.alibaba.fastjson2.JSON;
 import com.gaotao.common.utils.R;
-import com.gaotao.modules.po.entity.PurchaseOrder;
 import com.gaotao.modules.po.entity.PurchaseOrderDto;
 import com.gaotao.modules.po.service.PoService;
-import com.gaotao.modules.print.entity.ZplData;
 import com.gaotao.modules.sys.controller.AbstractController;
 import com.gaotao.modules.trans.entity.TransDetailDto;
-import com.gaotao.modules.trans.service.TransDetailService;
-import com.gaotao.modules.trans.service.TransDetailSubService;
 import com.gaotao.modules.trans.service.TransHeaderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/src/main/java/com/gaotao/modules/trans/entity/TransDetailDto.java b/src/main/java/com/gaotao/modules/trans/entity/TransDetailDto.java
index 9b99366..1c469e8 100644
--- a/src/main/java/com/gaotao/modules/trans/entity/TransDetailDto.java
+++ b/src/main/java/com/gaotao/modules/trans/entity/TransDetailDto.java
@@ -2,12 +2,15 @@ package com.gaotao.modules.trans.entity;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class TransDetailDto extends TransDetail{
-
+    private String poNo;
     private String needHandlingUnit;
     private String needCheck;
     private String locationNo;
     private String warehouseId;
+    private List<TransDetailSubDto> handlingUnitList;
 }
 
diff --git a/src/main/java/com/gaotao/modules/trans/entity/TransDetailSubDto.java b/src/main/java/com/gaotao/modules/trans/entity/TransDetailSubDto.java
new file mode 100644
index 0000000..c4078eb
--- /dev/null
+++ b/src/main/java/com/gaotao/modules/trans/entity/TransDetailSubDto.java
@@ -0,0 +1,9 @@
+package com.gaotao.modules.trans.entity;
+
+import lombok.Data;
+
+@Data
+public class TransDetailSubDto extends TransDetailSub{
+    private Double perQty;
+    private Double packageQty;
+}
diff --git a/src/main/java/com/gaotao/modules/trans/service/TransNoControlService.java b/src/main/java/com/gaotao/modules/trans/service/TransNoControlService.java
index 8d2398d..b66776c 100644
--- a/src/main/java/com/gaotao/modules/trans/service/TransNoControlService.java
+++ b/src/main/java/com/gaotao/modules/trans/service/TransNoControlService.java
@@ -6,4 +6,5 @@ import com.gaotao.modules.trans.entity.TransNoControl;
 
 public interface TransNoControlService extends IService<TransNoControl> {
 
+    TransNoControl getTransNo(String site, String transType,int padLength);
 }
diff --git a/src/main/java/com/gaotao/modules/trans/service/impl/TransHeaderServiceImpl.java b/src/main/java/com/gaotao/modules/trans/service/impl/TransHeaderServiceImpl.java
index b25e8c8..226592b 100644
--- a/src/main/java/com/gaotao/modules/trans/service/impl/TransHeaderServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/trans/service/impl/TransHeaderServiceImpl.java
@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gaotao.modules.sys.entity.SysUserEntity;
 import com.gaotao.modules.trans.dao.TransHeaderMapper;
 import com.gaotao.modules.trans.dao.TransNoControlMapper;
-import com.gaotao.modules.trans.entity.TransDetailDto;
-import com.gaotao.modules.trans.entity.TransDetailSub;
-import com.gaotao.modules.trans.entity.TransHeader;
-import com.gaotao.modules.trans.entity.TransNoControl;
+import com.gaotao.modules.trans.entity.*;
 import com.gaotao.modules.trans.service.TransDetailService;
 import com.gaotao.modules.trans.service.TransDetailSubService;
 import com.gaotao.modules.trans.service.TransHeaderService;
@@ -34,16 +31,14 @@ public class TransHeaderServiceImpl extends ServiceImpl<TransHeaderMapper, Trans
     private TransNoControlService transNoService;
     @Autowired
     private InventoryStockService stockService;
-    @Autowired
-    private TransNoControlMapper transNoMapper;
 
     @Override
     @Transactional
     public void saveTrans(TransDetailDto inData) {
         SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
         String transType = "CRT";
-        // 获取流水号
-        TransNoControl transNo = transNoMapper.getTransNo(inData.getSite(),transType,8);
+        // 获取流水号,出错不回滚
+        TransNoControl transNo = transNoService.getTransNo(inData.getSite(),transType,8);
         TransHeader transHeader = new TransHeader();
         transHeader.setSite(inData.getSite());
         transHeader.setTransNo(transNo.getNewTransNo());
@@ -64,8 +59,22 @@ public class TransHeaderServiceImpl extends ServiceImpl<TransHeaderMapper, Trans
         inData.setTransNo(transHeader.getTransNo());
         detailService.save(inData);
         if ("Y".equals(inData.getNeedHandlingUnit())) {
-            TransDetailSub transDetailSub = new TransDetailSub();
-            subService.save(transDetailSub);
+            for (int i = 0; i < inData.getHandlingUnitList().size(); i++) {
+                TransDetailSub transDetailSub = new TransDetailSub();
+                transDetailSub.setSite(inData.getSite());
+                transDetailSub.setTransNo(transHeader.getTransNo());
+                transDetailSub.setItemNo((double) i);
+                String subType = "HU";
+                // 获取流水号
+                TransNoControl subNo = transNoService.getTransNo(inData.getSite(),subType,8);
+                transDetailSub.setSubNo(subNo.getNewTransNo());
+                transDetailSub.setSeqNo(inData.getItemNo());
+                transDetailSub.setSubQty(inData.getHandlingUnitList().get( i).getPerQty());
+                //transDetailSub.setDirection(inData.getDirection());
+                transDetailSub.setOrderRef1(inData.getPoNo());
+                //transDetailSub.setOrderRef2(inData.getOrderRef2());
+                subService.save(transDetailSub);
+            }
         }
         // 免检更新库存 待检验的出入库记录状态为待检验
         if ("N".equals(inData.getNeedCheck())) {
diff --git a/src/main/java/com/gaotao/modules/trans/service/impl/TransNoControlServiceImpl.java b/src/main/java/com/gaotao/modules/trans/service/impl/TransNoControlServiceImpl.java
index 1f24ffd..bed239e 100644
--- a/src/main/java/com/gaotao/modules/trans/service/impl/TransNoControlServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/trans/service/impl/TransNoControlServiceImpl.java
@@ -5,10 +5,20 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gaotao.modules.trans.dao.TransNoControlMapper;
 import com.gaotao.modules.trans.entity.TransNoControl;
 import com.gaotao.modules.trans.service.TransNoControlService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 
 @Service
 public class TransNoControlServiceImpl extends ServiceImpl<TransNoControlMapper, TransNoControl> implements TransNoControlService {
+    @Autowired
+    private TransNoControlMapper transNoMapper;
 
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public TransNoControl getTransNo(String site, String transType, int length) {
+        // 调用存储过程获取流水号，这部分不受主事务影响
+        return transNoMapper.getTransNo(site, transType, length);
+    }
 }