From be32a8ddbcbb4f6e7b707e6ef8d6c24c05a48897 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 16 六月 2023 16:02:55 +0800
Subject: [PATCH] #出入库日志修改

---
 src/main/java/com/zy/asrs/controller/ManLocDetlController.java    |    2 
 src/main/webapp/static/js/saasLog/saasLog.js                      |    1 
 src/main/resources/mapper/SaasLogMapper.xml                       |    1 
 src/main/java/com/zy/asrs/controller/MobileController.java        |    4 +-
 src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java |    5 +-
 src/main/java/com/zy/system/entity/SaasLog.java                   |    4 ++
 src/main/java/com/zy/asrs/controller/NodeController.java          |    6 +-
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java     |   12 ++++--
 src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java       |   15 ++++---
 src/main/java/com/zy/asrs/service/ManLocDetlService.java          |    3 +
 src/main/java/com/zy/asrs/service/NodeService.java                |    7 ++-
 src/main/java/com/zy/asrs/service/MobileService.java              |    5 +-
 src/main/java/com/zy/asrs/utils/SaasUtils.java                    |    3 +
 13 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
index 2773e4e..d87a31c 100644
--- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
@@ -76,7 +76,7 @@
     @RequestMapping("/manLocDetl/adjust/start")
     @ManagerAuth(memo = "搴撳瓨璋冩暣")
     public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
-        manLocDetlService.adjustLocDetl(param, getUserId());
+        manLocDetlService.adjustLocDetl(param, getUserId(),getUser());
         return R.ok("搴撳瓨璋冩暣鎴愬姛");
     }
 
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index df3fd15..e4f39f9 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -347,7 +347,7 @@
         if (json == null){
             return R.error("浼犲叆鏁版嵁涓虹┖");
         }
-        return mobileService.manDetlIn(json);
+        return mobileService.manDetlIn(json, getUser());
     }
 
     //骞冲簱pda涓嬫灦
@@ -357,7 +357,7 @@
         if (json == null){
             return R.error("浼犲叆鏁版嵁涓虹┖");
         }
-        return mobileService.manDetlOut(json);
+        return mobileService.manDetlOut(json , getUser());
     }
 
 }
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index 8e80d78..918c71c 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -314,13 +314,13 @@
         if (node.getType() != 3) {
           return R.error("浠呭彲閫夋嫨璐т綅");
         }
-        return nodeService.stockPakin(number, getUserId(), getHostId());
+        return nodeService.stockPakin(number, getUserId(), getHostId(),getUser());
     }
 
     @RequestMapping("/work/stock/pakout")
     @ManagerAuth(memo = "鍑哄簱")
     public R initPakout(@RequestBody List<InitPakoutParam> params) {
-        return nodeService.initPakout(params, getUserId(), getHostId());
+        return nodeService.initPakout(params, getUserId(), getHostId(),getUser());
     }
 
     @PostMapping(value = "/work/empty/stock")
@@ -333,7 +333,7 @@
     @ManagerAuth(memo = "搴撲綅绉昏浆")
     public R locMoveStart(@RequestParam String sourceLocNo,
                           @RequestParam String targetLocNo) {
-        nodeService.locMove(sourceLocNo, targetLocNo, getUserId());
+        nodeService.locMove(sourceLocNo, targetLocNo, getUserId(),getUser());
         return R.ok("绉诲簱鍚姩鎴愬姛");
     }
     @RequestMapping(value = "/node/select/{id}/auth")
diff --git a/src/main/java/com/zy/asrs/service/ManLocDetlService.java b/src/main/java/com/zy/asrs/service/ManLocDetlService.java
index e20b5af..2cbf39f 100644
--- a/src/main/java/com/zy/asrs/service/ManLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/ManLocDetlService.java
@@ -5,6 +5,7 @@
 import com.zy.asrs.entity.ManLocDetl;
 import com.zy.asrs.entity.param.LocDetlAdjustParam;
 import com.zy.asrs.entity.result.StockVo;
+import com.zy.system.entity.User;
 
 import java.util.List;
 import java.util.Set;
@@ -58,7 +59,7 @@
     Page<ManLocDetl> getOutPage(Page<ManLocDetl> manLocDetlPage);
 
 
-    void adjustLocDetl(LocDetlAdjustParam param, Long userId);
+    void adjustLocDetl(LocDetlAdjustParam param, Long userId ,User user);
 
     Page<ManLocDetl> selectAllPage(Page<ManLocDetl> param);
 
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index c1cd82b..048c34f 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -8,6 +8,7 @@
 import com.zy.asrs.entity.param.CombParam;
 import com.zy.asrs.entity.param.MobileAdjustParam;
 import com.zy.asrs.entity.param.OffSaleParam;
+import com.zy.system.entity.User;
 
 import java.util.Date;
 
@@ -40,7 +41,7 @@
     void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
                   Double curOutQty, Integer ioType, Long userId, Date now);
 
-    R manDetlIn(JSONObject json);
+    R manDetlIn(JSONObject json ,User user);
 
-    R manDetlOut(JSONObject json);
+    R manDetlOut(JSONObject json,User user);
 }
diff --git a/src/main/java/com/zy/asrs/service/NodeService.java b/src/main/java/com/zy/asrs/service/NodeService.java
index ca184c2..0f6a79d 100644
--- a/src/main/java/com/zy/asrs/service/NodeService.java
+++ b/src/main/java/com/zy/asrs/service/NodeService.java
@@ -7,6 +7,7 @@
 import com.zy.asrs.entity.Node;
 import com.zy.asrs.entity.param.InitPakoutParam;
 import com.zy.asrs.entity.param.PakinParam;
+import com.zy.system.entity.User;
 
 import java.util.List;
 
@@ -22,11 +23,11 @@
 
         Node selectByUuid(String uuid, Long hostId, Integer type, Long parentId);
 
-    R stockPakin(PakinParam number, Long userId, Long hostId);
+    R stockPakin(PakinParam number, Long userId, Long hostId, User user);
 
-        R initPakout(List<InitPakoutParam> params, Long userId, Long hostId);
+        R initPakout(List<InitPakoutParam> params, Long userId, Long hostId,User user);
 
-    void locMove(String sourceLocNo, String targetLocNo, Long userId);
+    void locMove(String sourceLocNo, String targetLocNo, Long userId,User user);
 
     Page<Node> getPage(Page<Node> page);
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
index c27be8a..af96aae 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -12,6 +12,7 @@
 import com.zy.asrs.service.MatService;
 import com.zy.asrs.service.NodeService;
 import com.zy.asrs.utils.SaasUtils;
+import com.zy.system.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -142,7 +143,7 @@
 
     @Transactional
     @Override
-    public void adjustLocDetl(LocDetlAdjustParam param, Long userId) {
+    public void adjustLocDetl(LocDetlAdjustParam param, Long userId, User user) {
         Date now = new Date();
         this.baseMapper.delete(new EntityWrapper<ManLocDetl>()
                 .eq("loc_no", param.getLocNo()));
@@ -172,7 +173,7 @@
             manLocDetl.setUnit(mat.getUnit());
             manLocDetl.setBarcode(mat.getBarcode());
             manLocDetl.setPrice(mat.getPrice());
-            SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme());
+            SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme(),user.getUsername());
             this.baseMapper.insert(manLocDetl);
         }
     }
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index fb062fe..04b7a00 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -24,6 +24,7 @@
 import com.zy.common.service.CommonService;
 import com.zy.common.utils.HttpHandler;
 import com.zy.common.utils.Synchro;
+import com.zy.system.entity.User;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -519,7 +520,7 @@
 
     @Transactional
     @Override
-    public R manDetlIn(JSONObject json) {
+    public R manDetlIn(JSONObject json, User user) {
         Date date = new Date();
         String jsonLocNo = (String) json.get("locNo");
         Node node = nodeService.selectOne(new EntityWrapper<Node>()
@@ -572,6 +573,9 @@
                   if (checkManLocDetl.getWeight() == null){
                       checkManLocDetl.setWeight(0.0);
                   }
+                  if (jsonOrderDetl.getWeight() == null){
+                      jsonOrderDetl.setWeight(0.0);
+                  }
                 if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(),
                         node.getName(),
                         jsonOrderDetl.getMatnr(),
@@ -604,7 +608,7 @@
             }
             orderService.checkComplete(order.getOrderNo());
 
-            SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme());
+            SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());
         }
 
 
@@ -613,7 +617,7 @@
 
     @Transactional
     @Override
-    public R manDetlOut(JSONObject json) {
+    public R manDetlOut(JSONObject json,User user) {
         Date date = new Date();
         String jsonLocNo = (String) json.get("locNo");
         Node node = nodeService.selectOne(new EntityWrapper<Node>()
@@ -723,7 +727,7 @@
                     return R.error("鏇存柊骞冲簱搴撳瓨鐘舵�佸け璐�");
                 }
             }
-            SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme());
+            SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());
 
         }
         return R.ok("涓嬫灦瀹屾垚");
diff --git a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
index bb1df77..0dafa15 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -19,6 +19,7 @@
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.SaasUtils;
 import com.zy.asrs.utils.VersionUtils;
+import com.zy.system.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -84,7 +85,7 @@
     }
 
     @Override
-    public R stockPakin(PakinParam param, Long userId, Long hostId) {
+    public R stockPakin(PakinParam param, Long userId, Long hostId, User user) {
         Node node = nodeService.selectByUuid(param.getNodeId(), hostId);
         if (node == null) {
             node = nodeService.selectById(param.getNodeId());
@@ -122,7 +123,7 @@
                 manLocDetl.setCreateBy(userId);
                 manLocDetl.setStatus(1);
                 manLocDetl.setPayment(1);
-                SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme());
+                SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername());
                 manLocDetlService.insert(manLocDetl);
             }else {
                 check.setAnfme(dto.getCount() + check.getAnfme());
@@ -144,7 +145,7 @@
 
     @Transactional
     @Override
-    public R initPakout(List<InitPakoutParam> params, Long userId, Long hostId) {
+    public R initPakout(List<InitPakoutParam> params, Long userId, Long hostId,User user) {
         if (!Cools.isEmpty(params)) {
             Date now = new Date();
             for (InitPakoutParam param : params) {
@@ -162,7 +163,7 @@
                 if (manLocDetl.getAnfme() - param.getCount() < 0) {
                     return R.error("鐗╂枡:"+ param.getMatnr() + " 鍦ㄥ簱浣嶄腑鏁伴噺涓嶈冻");
                 } else if (manLocDetl.getAnfme() - param.getCount() == 0) {
-                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount());
+                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername());
                     manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
                             .eq("loc_no",node.getUuid())
                             .eq("matnr",param.getMatnr()));
@@ -172,7 +173,7 @@
                     manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
                             .eq("loc_no",node.getUuid())
                             .eq("matnr",param.getMatnr()));
-                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount());
+                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername());
                 }
             }
         }
@@ -181,7 +182,7 @@
 
     @Transactional
     @Override
-    public void locMove(String sourceLocNo, String targetLocNo, Long userId) {
+    public void locMove(String sourceLocNo, String targetLocNo, Long userId,User user) {
         List<ManLocDetl> sourceManDetl = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>()
                 .like("loc_no", sourceLocNo));
         for (ManLocDetl source : sourceManDetl) {
@@ -200,7 +201,7 @@
                 source.setLocNo(targetNode.getUuid());
                 source.setNodeId(targetNode.getId());
 
-                SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme());
+                SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername());
                 manLocDetlService.insert(source);
             }else {
                 check.setAnfme(check.getAnfme() + source.getAnfme());
diff --git a/src/main/java/com/zy/asrs/utils/SaasUtils.java b/src/main/java/com/zy/asrs/utils/SaasUtils.java
index 555ec87..e916626 100644
--- a/src/main/java/com/zy/asrs/utils/SaasUtils.java
+++ b/src/main/java/com/zy/asrs/utils/SaasUtils.java
@@ -8,7 +8,7 @@
 import java.util.Date;
 
 public class SaasUtils {
-    public static void insertLog(Integer type, String locNo, String matnr,Double anfme){
+    public static void insertLog(Integer type, String locNo, String matnr,Double anfme,String user){
         SaasLogService bean = SpringUtils.getBean(SaasLogService.class);
         SaasLog saasLog = new SaasLog();
         saasLog.setType(type);
@@ -17,6 +17,7 @@
         saasLog.setIoTime(new Date());
         saasLog.setAnfme(anfme);
         saasLog.setCreateBy(1L);
+        saasLog.setCreateByName(user);
         bean.insert(saasLog);
     }
 }
diff --git a/src/main/java/com/zy/system/entity/SaasLog.java b/src/main/java/com/zy/system/entity/SaasLog.java
index 36d64e3..fb136f6 100644
--- a/src/main/java/com/zy/system/entity/SaasLog.java
+++ b/src/main/java/com/zy/system/entity/SaasLog.java
@@ -50,6 +50,10 @@
     @TableField("anfme")
     private Double anfme;
 
+    @ApiModelProperty(value= "")
+    @TableField("create_by_name")
+    private String createByName;
+
     public SaasLog() {}
 
     public SaasLog(Long id,Integer type,String locNo,String matnr,Date ioTime,Long createBy) {
diff --git a/src/main/resources/mapper/SaasLogMapper.xml b/src/main/resources/mapper/SaasLogMapper.xml
index 6dcd2b3..62beceb 100644
--- a/src/main/resources/mapper/SaasLogMapper.xml
+++ b/src/main/resources/mapper/SaasLogMapper.xml
@@ -10,6 +10,7 @@
         <result column="matnr" property="matnr" />
         <result column="io_time" property="ioTime" />
         <result column="create_by" property="createBy" />
+        <result column="create_by_name" property="createByName" />
 
     </resultMap>
 
diff --git a/src/main/webapp/static/js/saasLog/saasLog.js b/src/main/webapp/static/js/saasLog/saasLog.js
index b5c5278..1c6c43e 100644
--- a/src/main/webapp/static/js/saasLog/saasLog.js
+++ b/src/main/webapp/static/js/saasLog/saasLog.js
@@ -27,6 +27,7 @@
             ,{field: 'type$', align: 'center',title: '鎿嶄綔绫诲瀷'}
             ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
             ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+            ,{field: 'createByName', align: 'center',title: '鎿嶄綔浜�'}
             ,{field: 'ioTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
             ,{field: 'createBy', align: 'center',title: '', hide:true}
 

--
Gitblit v1.9.1