From be554d9e52799a0ee14c98b0959d07ab3847c8e6 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 20 十月 2025 15:24:27 +0800
Subject: [PATCH] 联调

---
 src/main/java/com/zy/asrs/controller/MatController.java |   72 ++++++++++++++++++++++++++++++++---
 1 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index e1fb0d2..06d4717 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -10,10 +10,11 @@
 import com.core.annotations.ManagerAuth;
 import com.core.common.*;
 import com.core.exception.CoolException;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.MatPrint;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.EmptyPlateOutParam;
 import com.zy.asrs.entity.result.KeyValueVo;
+import com.zy.asrs.service.InOutService;
+import com.zy.asrs.service.MatBarcodeService;
 import com.zy.asrs.service.MatService;
 import com.zy.asrs.utils.MatExcelListener;
 import com.zy.common.CodeRes;
@@ -41,6 +42,10 @@
     private MatService matService;
     @Autowired
     private SnowflakeIdWorker snowflakeIdWorker;
+    @Autowired
+    private InOutService inOutService;
+    @Autowired
+    private MatBarcodeService matBarcodeService;
 
     @RequestMapping(value = "/mat/auto/matnr/auth")
     public R autoMatnr(){
@@ -63,7 +68,7 @@
         EntityWrapper<Mat> wrapper = new EntityWrapper<>();
         if (!Cools.isEmpty(condition)) {
 //            wrapper.like("matnr", condition).or().like("maktx", condition);
-            wrapper.like("matnr", condition).or().like("specs", condition);
+            wrapper.like("matnr", condition).or().like("maktx", condition).or().like("model", condition);
         }
         wrapper.orderBy("create_time", false);
         List<Mat> mats = matService.selectList(wrapper);
@@ -96,7 +101,7 @@
         return R.ok(matService.getPage2(new Page<>(curr, limit)
                 , String.valueOf(tagId)
                 , param.get("matnr")
-                , param.get("maktx")
+                , param.get("name")
                 , param.get("specs"))
         );
 
@@ -122,13 +127,22 @@
             return R.error("缂栧彿宸插瓨鍦�");
         }
         Date now = new Date();
+        InOut inOut=new InOut();
         mat.setCreateBy(getUserId());
         mat.setCreateTime(now);
         mat.setUpdateBy(getUserId());
         mat.setUpdateTime(now);
         mat.setStatus(1);
+        inOut.setMatnr(mat.getMatnr());
+        inOut.setMaktx(mat.getMaktx());
+        inOut.setColor(mat.getColor());
+        inOut.setSpecs(mat.getSpecs());
+        inOut.setTemp1("");
         if (!matService.insert(mat)) {
-            throw new CoolException("娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
+            throw new CoolException("鍟嗗搧妗ｆ娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
+        }
+        if (!inOutService.insert(inOut)){
+            throw new CoolException("鍟嗗搧淇℃伅娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
         }
         return R.ok();
     }
@@ -139,9 +153,31 @@
         if (Cools.isEmpty(mat) || null==mat.getId()){
             return R.error();
         }
+        if (mat.getColor().equals("姝ｅ父")){
+            mat.setColor("鎶ュ簾");
+        }else if (mat.getColor().equals("鎶ュ簾")){
+            mat.setColor("姝ｅ父");
+        }
+        InOut inOut = inOutService.selectByMatnr(mat.getMatnr());
+        inOut.setMatnr(mat.getMatnr());
+        inOut.setMaktx(mat.getMaktx());
+        inOut.setColor(mat.getColor());
+        inOut.setSpecs(mat.getSpecs());
         mat.setUpdateBy(getUserId());
         mat.setUpdateTime(new Date());
         matService.updateById(mat);
+        inOutService.updateById(inOut);
+        return R.ok();
+    }
+
+    /*鐗╂枡鎵樼洏缁戝畾*/
+    @RequestMapping(value = "/mat/barcode/auth")
+    @ManagerAuth
+    public R addBarcodeMatnr(Mat mat) {
+        if (Cools.isEmpty(mat.getUnit())){
+            return R.error(BaseRes.PARAM);
+        }
+        matBarcodeService.addBarcodeMatnrTwo(mat);
         return R.ok();
     }
 
@@ -158,6 +194,28 @@
             }
         }
         return R.ok();
+    }
+
+    @RequestMapping(value = "/mat/turn/over/list/auth")
+    @ManagerAuth
+    public R turnOverList(@RequestParam(defaultValue = "1")Integer curr,
+                          @RequestParam(defaultValue = "10")Integer limit,
+                          @RequestParam Map<String, Object> param){
+        return R.ok(matService.getMatTurnPage(toPage(curr, limit, param, Mat.class)));
+    }
+
+    @RequestMapping("/mat/turn/over/take/site")
+    @ManagerAuth()
+    public R availableTakeSite(@RequestParam(required = false) String matnr){
+        List<Map<String, Object>> result = new ArrayList<>();
+        List<Mat> mats = matService.selectByMatnrLink(matnr);
+        for (Mat mat : mats) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("siteId", mat.getId());
+            map.put("desc", mat.getMatnr());
+            result.add(map);
+        }
+        return R.ok().add(result);
     }
 
     @RequestMapping(value = "/mat/export/auth")
@@ -294,7 +352,7 @@
     @ManagerAuth
     public R getMatDataKV(@RequestParam(required = false) String condition) {
         Wrapper<Mat> wrapper = new EntityWrapper<Mat>()
-                .andNew().like("matnr", condition).or().like("maktx", condition)
+                .andNew().like("matnr", condition).or().like("maktx", condition).or().like("model",condition)
                 .orderBy("create_time", false);
         List<Mat> mats = matService.selectPage(new Page<>(1, 30), wrapper).getRecords();
         List<KeyValueVo> valueVos = new ArrayList<>();

--
Gitblit v1.9.1