From 9b6a8806dfcf3ae7ce399a6386286a0b5c437491 Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Tue, 24 Mar 2026 11:26:35 +0800
Subject: [PATCH] =?UTF-8?q?sap=20=E5=85=B6=E4=BB=96=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CRollinfoController.java       | 28 +++++++++++++++++++
 .../service/impl/CRollinfoServiceImpl.java    |  3 +-
 .../service/impl/TransheaderServiceImpl.java  |  6 ++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/finishedProduct/controller/CRollinfoController.java b/src/main/java/com/gaotao/modules/finishedProduct/controller/CRollinfoController.java
index 1ab351b..357335b 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/controller/CRollinfoController.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/controller/CRollinfoController.java
@@ -5,6 +5,7 @@ import com.gaotao.common.exception.XJException;
 import com.gaotao.common.utils.PageUtils;
 import com.gaotao.common.utils.R;
 import com.gaotao.modules.finishedProduct.entity.CRollinfoEntity;
+import com.gaotao.modules.finishedProduct.sap.service.SapRollService;
 import com.gaotao.modules.finishedProduct.service.CRollinfoService;
 import com.gaotao.modules.finishedProduct.vo.CRollInfoStorageVo;
 import com.gaotao.modules.finishedProduct.vo.CRollinfoVo;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -30,6 +32,9 @@ public class CRollinfoController extends AbstractController {
     @Autowired
     private CRollinfoService cRollinfoService;
 
+    @Autowired
+    private SapRollService sapRollService;
+
 
     /*
      * @Author sxm
@@ -265,4 +270,27 @@ public class CRollinfoController extends AbstractController {
         return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
     }
 
+    // ==================== SAP成品出入库接口 ====================
+
+    @PostMapping("/sapOutRollno")
+    public R sapOutRollno(@RequestBody CRollinfoEntity rollno) {
+        return sapRollService.sapOutRollno(rollno);
+    }
+
+    @PostMapping("/sapRollToStorage")
+    public R sapRollToStorage(@RequestBody CRollInfoStorageVo cRollInfoStorageVo) {
+        return sapRollService.sapRollToStorage(cRollInfoStorageVo);
+    }
+
+    @PostMapping("/sapBatchRollOutbound")
+    public R sapBatchRollOutbound(@RequestBody List<CRollinfoEntity> cRollinfoList) {
+        return sapRollService.sapBatchRollOutbound(cRollinfoList);
+    }
+
+    @GetMapping("/sapUfdOptions")
+    public R sapUfdOptions(@RequestParam("type") String type) {
+        List<Map<String, Object>> options = sapRollService.getSapUfdOptions(type);
+        return R.ok().put("options", options);
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
index ecee443..756af66 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
@@ -808,7 +808,8 @@ public class CRollinfoServiceImpl extends ServiceImpl<CRollinfoDao, CRollinfoEnt
         CRollinfoEntity cRollInfo = lambdaQuery()
                 .eq(StringUtils.isNotEmpty(rollno.getRollno()), CRollinfoEntity::getRollno, rollno.getRollno())
                 .eq(StringUtils.isNotEmpty(rollno.getStatusDb()), CRollinfoEntity::getStatusDb, rollno.getStatusDb())
-                .eq(StringUtils.isNotEmpty(rollno.getSite()), CRollinfoEntity::getSite, rollno.getSite()).one();
+                .eq(StringUtils.isNotEmpty(rollno.getSite()), CRollinfoEntity::getSite, rollno.getSite())
+                .and(w -> w.ne(CRollinfoEntity::getSourcetype, "SAP成品入库").or().isNull(CRollinfoEntity::getSourcetype)).one();
         if (cRollInfo == null) {
             return R.error(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200105));
         }
diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/TransheaderServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/TransheaderServiceImpl.java
index 537fc5d..e9200d3 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/TransheaderServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/TransheaderServiceImpl.java
@@ -64,6 +64,12 @@ public class TransheaderServiceImpl extends ServiceImpl<TransheaderDao, Transhea
             case "CRR":
                 remark = "采购退货";
                 break;
+            case "SOI":
+                remark = "SAP成品入库";
+                break;
+            case "SOC":
+                remark = "SAP成品出库";
+                break;
         }
         herder.setRemark(remark);
         this.save(herder);