From 48a341f0b97479b449cbac9f53faf56f08a5c7cc Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 09 七月 2025 16:48:39 +0800
Subject: [PATCH] 完善erp对接

---
 src/main/java/com/zy/asrs/controller/OpenMesController.java |   61 +++++++++++++-----------------
 1 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenMesController.java b/src/main/java/com/zy/asrs/controller/OpenMesController.java
index 03c083c..f629b01 100644
--- a/src/main/java/com/zy/asrs/controller/OpenMesController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenMesController.java
@@ -2,14 +2,13 @@
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.core.annotations.AppAuth;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
 import com.core.common.R;
 import com.core.exception.CoolException;
-import com.zy.asrs.entity.InventoryCheckOrder;
-import com.zy.asrs.entity.InventoryCheckOrderDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.*;
 import com.zy.asrs.service.*;
 import com.zy.common.web.BaseController;
@@ -39,10 +38,13 @@
     private OpenService openService;
 
     @Autowired
-    private ManLocDetlService manLocDetlService;
+    private MatService matService;
 
     @Autowired
-    private WrkMastService wrkMastService;
+    private WorkService workService;
+
+    @Autowired
+    private LocMastService locMastService;
 
     @Autowired
     private InventoryCheckOrderService inventoryCheckOrderService;
@@ -73,17 +75,17 @@
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
         }
-        WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
-        if (Cools.isEmpty(wrkMast)) {
-            return R.error("鏃犳硶閫氳繃鎵樼洏鐮佹壘鍒拌宸ヤ綔妗�,璇锋鏌ユ墭鐩樼爜鏄惁姝ｇ‘");
+        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("barcode", param.getPalletBarcode()));
+        if (locMast == null) {
+            throw new CoolException("璇ユ墭鐩樹笉瀛樺湪搴撲腑");
         }
         LocDetlAdjustParam adjustParam = new LocDetlAdjustParam();
-        adjustParam.setLocNo(wrkMast.getWrkSts() < 100 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo());
+        adjustParam.setLocNo(locMast.getLocNo());
         List<LocDetlAdjustParam.LocDetlAdjust> list = new ArrayList<>();
         param.getDetails().forEach(elem -> {
-            list.add(new LocDetlAdjustParam.LocDetlAdjust(elem.getMatnr(), elem.getBatch(), elem.getActulQty(), elem.getDanger()));
+            list.add(new LocDetlAdjustParam.LocDetlAdjust(elem.getProductionCode(), elem.getBatch(), elem.getActulQty(), elem.getQuality(),elem.getCode()));
         });
-        manLocDetlService.adjustLocDetl2(adjustParam, getUserId());
+        workService.adjustLocDetl(adjustParam, getUserId());
         return R.ok();
     }
 
@@ -161,22 +163,7 @@
                                 @RequestBody CheckOrderParam param,
                                 HttpServletRequest request) {
         auth(appkey, param, request);
-        String orderNo = param.getOrderNo();
-        long time = new Date().getTime();
-        if (Cools.isEmpty(orderNo)) {
-            switch (param.getArea()) {
-                case "鍫嗗灈鏈�":
-                    orderNo = "DDJ" + time;
-                    break;
-                case "鍥涘悜搴�":
-                    orderNo = "SXK" + time;
-                    break;
-                case "CTU":
-                    orderNo = "CTU" + time;
-                    break;
-            }
-            param.setOrderNo(orderNo);
-        }
+        String orderNo = param.getInventoryCode();
 
         int count = inventoryCheckOrderService.selectCount(new EntityWrapper<InventoryCheckOrder>().eq("order_no", orderNo));
         if (count > 0) {
@@ -184,14 +171,20 @@
         }
         InventoryCheckOrder checkOrder = new InventoryCheckOrder();
         checkOrder.setOrderNo(orderNo);
-        checkOrder.setCreateBy(getUserId().toString());
+        //checkOrder.setCreateBy(getUserId().toString());
         checkOrder.setCreateTime(new Date());
         checkOrder.setStatus("1");
         param.getDetails().forEach(elem -> {
-            checkOrder.setArea(param.getArea());
+            Mat mat = matService.selectByMatnr(elem.getProductionCode());
+            if (mat == null) {
+                throw new CoolException("鐗╂枡涓嶅瓨鍦�");
+            }
+            //checkOrder.setArea(param.getArea());
             InventoryCheckOrderDetl detail = new InventoryCheckOrderDetl();
-            detail.setMatnr(elem.getMatnr());
-            detail.setBatch(elem.getBatch());
+            detail.setMatnr(elem.getProductionCode());
+            detail.setOrderNo(orderNo);
+            detail.setMaktx(mat.getMaktx());
+            //detail.setBatch(elem.getBatch());
             inventoryCheckOrderDetlService.insert(detail);
         });
         inventoryCheckOrderService.insert(checkOrder);
@@ -204,9 +197,9 @@
     private void auth(String appkey, Object obj, HttpServletRequest request) {
         log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
         request.setAttribute("cache", obj);
-//        if (!auth) {
-//            return;
-//        }
+        if (!auth) {
+            return;
+        }
 //        if (Cools.isEmpty(appkey)) {
 //            throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
 //        }

--
Gitblit v1.9.1