sap 其他出入库页面调整

src/main/java/com/gaotao/modules/finishedProduct/controller/PageController.java

@@ -1,5 +1,6 @@
 package com.gaotao.modules.finishedProduct.controller;
 
+import com.gaotao.modules.finishedProduct.sap.service.SapRollService;
 import com.gaotao.modules.finishedProduct.vo.PackingVo;
 import com.gaotao.modules.pda.config.XuJieConfig;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,9 @@ public class PageController {
     @Autowired
     XuJieConfig xuJieConfig;
 
+    @Autowired
+    SapRollService sapRollService;
+
 
     /*
      * @Author sxm
@@ -146,4 +150,19 @@ public class PageController {
     public String  boxingManage(){
         return "/productwarehouse/other/boxManage";
     }
+
+    // ==================== SAP成品出入库页面路由 ====================
+
+    @GetMapping("/productwarehouse/sap/storage")
+    public String sapStorage(HttpServletRequest request, Model model) {
+        model.addAttribute("depots", xuJieConfig.getSoReceiveWarehouse());
+        model.addAttribute("ufdOptions", sapRollService.getSapUfdOptions("IN"));
+        return "/productwarehouse/sap/sap_storage";
+    }
+
+    @GetMapping("/productwarehouse/sap/outbound")
+    public String sapOutbound(Model model) {
+        model.addAttribute("ufdOptions", sapRollService.getSapUfdOptions("OUT"));
+        return "/productwarehouse/sap/sap_outbound";
+    }
 }

src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java

@@ -578,7 +578,7 @@ public class PackingServiceImpl implements PackingService {
             //查询打印的列信息
             List<Reportcontentitem> reportcontentitemList = reportcontentitemService.getReportcontentitemList(fileVo.getReportId());
             Map<String, String> itemMap = reportcontentitemList.stream().collect(Collectors.toMap(Reportcontentitem::getObjectgroup, Reportcontentitem::getDbfieldname));
-
+            String bartenderSeqKey = "";
             // 获取卷标签打印模板
             for (String key : itemMap.keySet()) {
                String dbName = itemMap.get(key);
@@ -594,9 +594,13 @@ public class PackingServiceImpl implements PackingService {
                         }
                     }
                 } else {
-                    // 手工参数 #子头
-                    if (dbName.indexOf("#") == 0) {
-                        itemMap.put(key, StringUtils.isNotEmpty(String.valueOf(paramMap.get(key))) ? String.valueOf(paramMap.get(key)) : " ");
+                    //流水号特殊测试
+                    if (dbName.startsWith("流水号")){
+                        bartenderSeqKey = key;
+                        log.info("流水号Key:{}",key);
+                    }else if (dbName.indexOf("#") == 0) {
+                        // 手工参数 #子头
+                        itemMap.put(key, paramMap.get(key) == null ? "" : String.valueOf(paramMap.get(key)));
                     }
                 }
             }
@@ -610,7 +614,7 @@ public class PackingServiceImpl implements PackingService {
             String seqNumber = reportfileSeqinfoService.getSeqNumber(fileVo.getReportId(), OutBoxConstant.SEQ_NUMBER, itemMap);
             //原佘莉写得方法
             if (StringUtils.isNotEmpty(seqNumber)) {
-                itemMap.put("流水号", seqNumber.toString());
+                itemMap.put(bartenderSeqKey, seqNumber.toString());
             }
             log.info("流水号处理完成");