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/system/entity/SaasLog.java | 12 ++++++
src/main/webapp/static/js/saasLog/saasLog.js | 2 +
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 12 ++++--
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 12 ++++--
src/main/java/com/zy/asrs/controller/MobileController.java | 3 +
src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java | 3 +
src/main/java/com/zy/asrs/utils/SaasUtils.java | 18 ++++++++
7 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 22f753b..ac86564 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -533,7 +533,8 @@
plaService.updateById(pla);
- SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),locNo,pla.getBatch(),pla.getPackageNo());
+ SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),
+ locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
return R.ok();
}
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 c5f99a9..8eacaa6 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -163,7 +163,8 @@
manLocDetl.setAnfme(locDetlAdjust.getCount());
manLocDetl.setUpdateBy(userId);
manLocDetl.setModiTime(now);
- SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme(),user.getUsername(),null,null,null);
+ SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme(),user.getUsername(),
+ null,null,null,null, null);
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 a26480e..2c01801 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -663,7 +663,8 @@
}
orderService.checkComplete(order.getOrderNo());
- SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),null,null,null);
+ SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
+ null,null,null,null,null);
}
@@ -804,7 +805,8 @@
return R.error("鏇存柊骞冲簱搴撳瓨鐘舵�佸け璐�");
}
}
- SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),null,null,null);
+ SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
+ null,null,null,null,null);
}
return R.ok("涓嬫灦瀹屾垚");
@@ -1228,7 +1230,8 @@
pla.setLocNo(node.getUuid());
plaService.updateById(pla);
- SaasUtils.insertLog(0,locNo,pla.getBrand(),pla.getWeightAnfme(),user.getUsername(),null,pla.getBatch(),pla.getPackageNo());
+ SaasUtils.insertLog(0,locNo,pla.getBrand(),pla.getWeightAnfme(),user.getUsername(),
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
}
@Override
@@ -1267,7 +1270,8 @@
pla.setStatus(GlobleParameter.PLA_STATUS_3);
}
plaService.updateById(pla);
- SaasUtils.insertLog(1,locNo,pla.getBrand(),anfme,null,null,pla.getBatch(),pla.getPackageNo());
+ SaasUtils.insertLog(1,locNo,pla.getBrand(),anfme,null,null,
+ pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
//鏇存柊璁㈠崟鏄庣粏
Order order = orderService.selectByNo(orderNo);
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 ff3b657..aee47b5 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -123,7 +123,8 @@
manLocDetl.setCreateBy(userId);
manLocDetl.setStatus(1);
manLocDetl.setPayment(1);
- SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername(),null,null,null);
+ SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername(),
+ null,null,null,null,null);
manLocDetlService.insert(manLocDetl);
}else {
// check.setAnfme(dto.getCount() + check.getAnfme());
@@ -164,7 +165,8 @@
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(),user.getUsername(),null,null,null);
+ SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername(),
+ null,null,null,null,null);
manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
.eq("loc_no",node.getUuid())
.eq("matnr",param.getMatnr()));
@@ -174,7 +176,8 @@
manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
.eq("loc_no",node.getUuid())
.eq("matnr",param.getMatnr()));
- SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername(),null,null,null);
+ SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername(),
+ null,null,null,null,null);
}
}
}
@@ -204,7 +207,8 @@
source.setLocNo(targetNode.getUuid());
source.setNodeId(targetNode.getId());
- SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername(),null,null,null);
+ SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername(),
+ null,null,null,null,null);
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 0fb2eae..a86d340 100644
--- a/src/main/java/com/zy/asrs/utils/SaasUtils.java
+++ b/src/main/java/com/zy/asrs/utils/SaasUtils.java
@@ -7,7 +7,21 @@
import java.util.Date;
public class SaasUtils {
- public static void insertLog(Integer type, String locNo, String matnr,Double anfme,String user,String targetLocNo,String batch,Integer packageNo){
+ /**
+ * 璁板綍鍑哄叆搴撴棩蹇�
+ * @param type
+ * @param locNo
+ * @param matnr
+ * @param anfme
+ * @param user
+ * @param targetLocNo
+ * @param batch
+ * @param packageNo
+ * @param owner 涓讳綋
+ * @param workshop 杞﹂棿
+ */
+ public static void insertLog(Integer type, String locNo, String matnr,Double anfme,
+ String user,String targetLocNo,String batch,Integer packageNo,String owner,String workshop){
SaasLogService bean = SpringUtils.getBean(SaasLogService.class);
SaasLog saasLog = new SaasLog();
saasLog.setType(type);
@@ -20,6 +34,8 @@
saasLog.setPackageNo(packageNo);
saasLog.setCreateBy(1L);
saasLog.setCreateByName(user);
+ saasLog.setOwner(owner);
+ saasLog.setWorkshop(workshop);
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 1716bb7..aa44f07 100644
--- a/src/main/java/com/zy/system/entity/SaasLog.java
+++ b/src/main/java/com/zy/system/entity/SaasLog.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -15,6 +16,7 @@
@Data
@TableName("sys_saas_log")
+@AllArgsConstructor
public class SaasLog implements Serializable {
private static final long serialVersionUID = 1L;
@@ -59,6 +61,16 @@
private String batch;
private Integer packageNo;
+ /**
+ * 涓讳綋
+ */
+ private String owner;
+
+ /**
+ * 杞﹂棿
+ */
+ private String workshop;
+
public SaasLog() {}
public SaasLog(Long id,Integer type,String locNo,String matnr,Date ioTime,Long createBy) {
diff --git a/src/main/webapp/static/js/saasLog/saasLog.js b/src/main/webapp/static/js/saasLog/saasLog.js
index 644c637..cf0658a 100644
--- a/src/main/webapp/static/js/saasLog/saasLog.js
+++ b/src/main/webapp/static/js/saasLog/saasLog.js
@@ -29,6 +29,8 @@
,{field: 'batch', align: 'center',title: '鎵瑰彿'}
,{field: 'packageNo', align: 'center',title: '鍖呭彿'}
,{field: 'targetLocNo', align: 'center',title: '鐩爣搴撲綅'}
+ ,{field: 'owner', align: 'center',title: '涓讳綋'}
+ ,{field: 'workshop', align: 'center',title: '杞﹂棿'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'createByName', align: 'center',title: '鎿嶄綔浜�'}
,{field: 'ioTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
--
Gitblit v1.9.1