From 089c397e3eff318d9cec8edacaf6d0f70165c38a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 09 二月 2026 13:11:15 +0800
Subject: [PATCH] 入出库日志优化
---
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/controller/PlaController.java | 2 +-
src/main/java/com/zy/system/entity/SaasLog.java | 3 +++
src/main/webapp/static/js/saasLog/saasLog.js | 1 +
src/main/resources/logback-spring.xml | 4 ++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 14 ++++++++------
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 9 +++++----
src/main/resources/mapper/SaasLogMapper.xml | 1 +
src/main/java/com/zy/asrs/controller/MobileController.java | 2 +-
src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/utils/SaasUtils.java | 3 ++-
11 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 8393fff..708b4d5 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -611,7 +611,7 @@
plaService.updateById(pla);
SaasUtils.insertLog(2, sourceLocNo, pla.getBrand(), pla.getWeightAnfme(), getUser().getUsername(),
- locNo, pla.getBatch(), pla.getPackageNo(), pla.getOwner(), pla.getWorkshop(), null);
+ locNo, pla.getBatch(), pla.getPackageNo(), pla.getOwner(), pla.getWorkshop(), null,"绉诲簱鍓�:"+pla.getWeightAnfme());
});
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index f037979..41cf188 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -328,7 +328,7 @@
pla.setWeightAnfme(0.0);
plaService.updateById(pla);
SaasUtils.insertLog(1, pla.getLocNo(), pla.getBrand(), anfme, getUser().getUsername(),
- null, pla.getBatch(), pla.getPackageNo(), pla.getOwner(), pla.getWorkshop(), null);
+ null, pla.getBatch(), pla.getPackageNo(), pla.getOwner(), pla.getWorkshop(), null,"鍏ㄩ儴鍑哄簱" + anfme);
});
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 22e61f3..b2821b4 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -164,7 +164,7 @@
manLocDetl.setUpdateBy(userId);
manLocDetl.setModiTime(now);
SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme(),user.getUsername(),
- null,null,null,null, null,null);
+ null,null,null,null, null,null,"搴撳瓨璋冩暣涓�"+locDetlAdjust.getCount());
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 02dba32..aeeef26 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -666,7 +666,7 @@
orderService.checkComplete(order.getOrderNo());
SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
- null,null,null,null,null,null);
+ null,null,null,null,null,null,"璁㈠崟涓婃灦锛�"+jsonOrderDetl.getAnfme());
}
@@ -808,7 +808,7 @@
}
}
SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
- null,null,null,null,null,null);
+ null,null,null,null,null,null,"璁㈠崟涓嬫灦锛�" +jsonOrderDetl.getAnfme() );
}
return R.ok("涓嬫灦瀹屾垚");
@@ -1233,7 +1233,7 @@
plaService.updateById(pla);
SaasUtils.insertLog(0,locNo,pla.getBrand(),pla.getWeightAnfme(),user.getUsername(),
- null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla鍏ュ簱:" + pla.getWeightAnfme());
}
@Override
@@ -1275,7 +1275,7 @@
//鏇存柊plaQty淇℃伅
plaQty.setPakoutTime(Utils.getDateStr(new Date()));
plaQtyService.updateById(plaQty);
-
+ double beforeWeightAnfme = pla.getWeightAnfme();
//鏇存柊pla鏄庣粏
pla.setWeightAnfme(pla.getWeightAnfme() - anfme);
pla.setQtyAnfme(pla.getQtyAnfme() - anfme);
@@ -1288,7 +1288,7 @@
log.info("pla鍑哄簱v1,璁㈠崟鍑哄簱锛屾洿鏂颁负寰呭嚭搴撴垨鍒欏叏閮ㄥ嚭搴擄紝pla:{},anfme:{}锛屾槸鍚︽浛鎹�:{}",pla,anfme,isReplace);
plaService.updateById(pla);
SaasUtils.insertLog(1,locNo,pla.getBrand(),anfme,null,null,
- pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
+ pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla鍑哄簱鍓嶏細" + beforeWeightAnfme+",鍑哄簱锛�" + anfme);
//鏇存柊璁㈠崟鏄庣粏
Order order = orderService.selectByNo(orderNo);
@@ -1306,6 +1306,7 @@
@Override
public void plaPackOutWithoutOrder(String brand, String batch, Integer packageNo, Double anfme) {
Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
+ double beforeWeightAnfme = pla.getWeightAnfme();
if(Cools.isEmpty(pla)){
throw new CoolException("褰撳墠鐗╂枡鏄庣粏涓嶅瓨鍦�");
}
@@ -1326,7 +1327,8 @@
plaService.updateById(pla);
- SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,null,null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
+ SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,null,null,
+ pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla鎵嬪姩鍑哄簱鍓�:" + beforeWeightAnfme +",鍑哄簱锛�" + anfme);
}
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 463b75e..315a19e 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -124,7 +124,7 @@
manLocDetl.setStatus(1);
manLocDetl.setPayment(1);
SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername(),
- null,null,null,null,null,null);
+ null,null,null,null,null,null,"鍏ュ簱"+ dto.getCount());
manLocDetlService.insert(manLocDetl);
}else {
// check.setAnfme(dto.getCount() + check.getAnfme());
@@ -166,18 +166,19 @@
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,null,null,null);
+ null,null,null,null,null,null,"鍑哄簱鍓嶅墿浣欙細" + manLocDetl.getAnfme()+",鍑哄簱锛�"+param.getCount());
manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
.eq("loc_no",node.getUuid())
.eq("matnr",param.getMatnr()));
} else {
manLocDetl.setAnfme(manLocDetl.getAnfme() - param.getCount());
+ double beforeWeightAnfme = manLocDetl.getAnfme();
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,null,null,null);
+ null,null,null,null,null,null,"鍑哄簱鍓嶅墿浣欙細"+beforeWeightAnfme+"锛屽嚭搴擄細"+param.getCount());
}
}
}
@@ -208,7 +209,7 @@
source.setNodeId(targetNode.getId());
SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername(),
- null,null,null,null,null,null);
+ null,null,null,null,null,null,"绉诲簱鏁伴噺锛�" + source.getAnfme());
manLocDetlService.insert(source);
}else {
// check.setAnfme(check.getAnfme() + source.getAnfme());
diff --git a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
index 401a7c2..fcb33a3 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -141,13 +141,13 @@
pla.setTransfer("閫�璐�");
pla.setStash(""); // 搴撳尯
pla.setLocNo(""); // 搴撲綅
-
+ double beforeWeightAnfme = pla.getWeightAnfme();
pla.setWeightAnfme(pla.getWeightAnfme() + plaQty.getOrderWeight());
pla.setStatus(GlobleParameter.PLA_STATUS_1);
this.updateById(pla);
SaasUtils.insertLog(4,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
- null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"閫�鍥炲墠锛�"+beforeWeightAnfme+"锛岄��鍥炲悗锛�"+pla.getWeightAnfme());
});
}
diff --git a/src/main/java/com/zy/asrs/utils/SaasUtils.java b/src/main/java/com/zy/asrs/utils/SaasUtils.java
index 7effe27..7b88c2d 100644
--- a/src/main/java/com/zy/asrs/utils/SaasUtils.java
+++ b/src/main/java/com/zy/asrs/utils/SaasUtils.java
@@ -22,7 +22,7 @@
* @param docType 鍗曟嵁绫诲瀷
*/
public static void insertLog(Integer type, String locNo, String matnr,Double anfme,
- String user,String targetLocNo,String batch,Integer packageNo,String owner,String workshop, Long docType){
+ String user,String targetLocNo,String batch,Integer packageNo,String owner,String workshop, Long docType,String memo){
SaasLogService bean = SpringUtils.getBean(SaasLogService.class);
SaasLog saasLog = new SaasLog();
saasLog.setType(type);
@@ -38,6 +38,7 @@
saasLog.setOwner(owner);
saasLog.setWorkshop(workshop);
saasLog.setDocType(docType);
+ saasLog.setMemo(memo);
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 7363efb..2ce8bb3 100644
--- a/src/main/java/com/zy/system/entity/SaasLog.java
+++ b/src/main/java/com/zy/system/entity/SaasLog.java
@@ -77,6 +77,9 @@
@TableField("doc_type")
private Long docType;
+ @TableField("memo")
+ private String memo;
+
public SaasLog() {}
public SaasLog(Long id,Integer type,String locNo,String matnr,Date ioTime,Long createBy) {
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index f72c762..c969085 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -24,7 +24,7 @@
<file>${LOG_PATH}/info.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>${LOG_PATH}/info_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
- <maxHistory>10</maxHistory>
+ <maxHistory>60</maxHistory>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>10MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
@@ -43,7 +43,7 @@
<file>${LOG_PATH}/error.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>${LOG_PATH}/error_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
- <maxHistory>10</maxHistory>
+ <maxHistory>60</maxHistory>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>10MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
diff --git a/src/main/resources/mapper/SaasLogMapper.xml b/src/main/resources/mapper/SaasLogMapper.xml
index eab3742..ac6615f 100644
--- a/src/main/resources/mapper/SaasLogMapper.xml
+++ b/src/main/resources/mapper/SaasLogMapper.xml
@@ -11,6 +11,7 @@
<result column="io_time" property="ioTime" />
<result column="create_by" property="createBy" />
<result column="create_by_name" property="createByName" />
+ <result column="memo" property="memo" />
</resultMap>
<select id="selectListSummary" resultType="com.zy.system.entity.SaasLog">
diff --git a/src/main/webapp/static/js/saasLog/saasLog.js b/src/main/webapp/static/js/saasLog/saasLog.js
index b6c5bf0..71ed7fd 100644
--- a/src/main/webapp/static/js/saasLog/saasLog.js
+++ b/src/main/webapp/static/js/saasLog/saasLog.js
@@ -44,6 +44,7 @@
// ,{field: 'createByName', align: 'center',title: '鎿嶄綔浜�'}
,{field: 'ioTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
,{field: 'createBy', align: 'center',title: '', hide:true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
]],
request: {
--
Gitblit v1.9.1