From a8ab542c3f3bbb304f6fd7e66897433df65a2b3e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 28 二月 2024 16:28:30 +0800
Subject: [PATCH] 完善出入库日志记录

---
 src/main/java/com/zy/asrs/controller/PlaController.java |   49 ++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 7e0f478..ba3b843 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -27,10 +27,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @RestController
 public class PlaController extends BaseController {
@@ -47,6 +44,8 @@
     private OrderDetlService orderDetlService;
     @Autowired
     private PlaLogService plaLogService;
+    @Autowired
+    private MatService matService;
 
     @RequestMapping(value = "/pla/list/auth")
     @ManagerAuth
@@ -56,6 +55,12 @@
                   @RequestParam Map<String, Object> param){
         excludeTrash(param);
         EntityWrapper<Pla> wrapper = new EntityWrapper<>();
+
+        if(!Cools.isEmpty(param.get("brand"))){
+            wrapper.eq("brand",param.get("brand"));
+            param.remove("brand");
+        }
+
         convert(param, wrapper);
         wrapper.orderBy("modify_time",false);
         allLike(Pla.class, param.keySet(), wrapper, condition);
@@ -199,7 +204,8 @@
             pla.setModifyTime(new Date());
             pla.setWeightAnfme(0.0);
             plaService.updateById(pla);
-            SaasUtils.insertLog(1,pla.getLocNo(),pla.getBatch()+","+pla.getPackageNo(),anfme,getUser().getUsername());
+            SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,getUser().getUsername(),
+                    null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
         });
 
         return R.ok();
@@ -248,6 +254,33 @@
         return R.ok("瑙ｉ櫎鍐荤粨鎴愬姛");
     }
 
+    @RequestMapping(value = "/matMaktxQuery/auth")
+    @ManagerAuth
+    public R queryMat(String condition) {
+        EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+        wrapper.like("maktx", condition);
+        Page<Mat> page = matService.selectPage(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (Mat mat : page.getRecords()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", mat.getMaktx());
+            map.put("value", mat.getMaktx());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+    @RequestMapping(value = "/pla/statis/auth")
+    @ManagerAuth
+    public R statis(@RequestParam(defaultValue = "1")Integer curr,
+                    @RequestParam(defaultValue = "10")Integer limit,
+                    @RequestParam Map<String, Object> param) {
+
+        Page<Pla> stockStatis = plaService.getStockStatisAll(toPage(curr, limit, param, Pla.class));
+
+        return R.ok().add(stockStatis);
+    }
+
     /**
      * excel瀵煎叆妯℃澘涓嬭浇
      */
@@ -273,7 +306,8 @@
         try {
             EasyExcel.read(file.getInputStream(), PlaExcel.class, listener).sheet().doRead();
         }catch (Exception e){
-            throw new CoolException("瀵煎叆鐨勬暟鎹牸寮忛敊璇紝鍘熷洜锛�" + e.getMessage());
+            e.printStackTrace();
+            throw new CoolException("瀵煎叆鐨勬暟鎹牸寮忛敊璇紝鍘熷洜锛�" + e.getMessage() + "锛岀" + listener.getIndex() + "锛屾暟鎹牸寮忎笉瀵�");
         }
         return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉la鐗╂枡鏁版嵁");
     }
@@ -317,7 +351,7 @@
         manPakOut.setMaktx(plaQty.getBrand());
         manPakOut.setLocNo(plaQty.getLocNo());
         manPakOut.setBatch(plaQty.getBatch());
-        manPakOut.setBarcode(plaQty.getPackageNo());
+        manPakOut.setBarcode(plaQty.getPackageNo() + "");
         manPakOut.setUuid(String.valueOf(System.currentTimeMillis()));
         manPakOut.setCreateTime(new Date());
         manPakOut.setUpdateTime(new Date());
@@ -326,6 +360,7 @@
         manPakOut.setStatus(0);
         manPakOut.setDocId(plaQty.getOrderDetlId());
         manPakOut.setNodeId(plaQty.getId());
+        manPakOut.setCustName(plaQty.getCustomer());
         //manPakOut.setNodeId(plaQty.getOrderDetlId());
         manPakOutService.insert(manPakOut);
         return R.ok();

--
Gitblit v1.9.1