From 9aff2228c647b65bd2aa7aa9186445fb7b5d2219 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 27 二月 2026 13:43:51 +0800
Subject: [PATCH] 出入库日志记录是否分包
---
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 2
src/main/java/com/zy/asrs/controller/PlaController.java | 2
src/main/java/com/zy/system/entity/SaasLog.java | 14 +++++++
src/main/webapp/views/saasLog/saasLog.html | 21 ++++++++++
src/main/webapp/static/js/saasLog/saasLog.js | 2 +
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 10 ++--
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 8 ++--
src/main/resources/mapper/SaasLogMapper.xml | 3 +
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/system/controller/SaasLogController.java | 6 ++
src/main/java/com/zy/asrs/utils/SaasUtils.java | 5 ++
12 files changed, 60 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 708b4d5..8798a6f 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,"绉诲簱鍓�:"+pla.getWeightAnfme());
+ locNo, pla.getBatch(), pla.getPackageNo(), pla.getOwner(), pla.getWorkshop(), null,"绉诲簱鍓�:"+pla.getWeightAnfme(),"",0);
});
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 41cf188..b4b08f2 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,"鍏ㄩ儴鍑哄簱" + anfme);
+ null, pla.getBatch(), pla.getPackageNo(), pla.getOwner(), pla.getWorkshop(), null,"鍏ㄩ儴鍑哄簱" + anfme,pla.getMemo(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);
});
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 b2821b4..41452ad 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,"搴撳瓨璋冩暣涓�"+locDetlAdjust.getCount());
+ null,null,null,null, null,null,"搴撳瓨璋冩暣涓�"+locDetlAdjust.getCount(),"",0);
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 aeeef26..7a601e3 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,"璁㈠崟涓婃灦锛�"+jsonOrderDetl.getAnfme());
+ null,null,null,null,null,null,"璁㈠崟涓婃灦锛�"+jsonOrderDetl.getAnfme(),"",0);
}
@@ -808,7 +808,7 @@
}
}
SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
- null,null,null,null,null,null,"璁㈠崟涓嬫灦锛�" +jsonOrderDetl.getAnfme() );
+ null,null,null,null,null,null,"璁㈠崟涓嬫灦锛�" +jsonOrderDetl.getAnfme(),"",0);
}
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,"pla鍏ュ簱:" + pla.getWeightAnfme());
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla鍏ュ簱:" + pla.getWeightAnfme(),pla.getMemo(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);
}
@Override
@@ -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鍑哄簱鍓嶏細" + beforeWeightAnfme+",鍑哄簱锛�" + anfme);
+ pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla鍑哄簱鍓嶏細" + beforeWeightAnfme+",鍑哄簱锛�" + anfme,pla.getMemo(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);
//鏇存柊璁㈠崟鏄庣粏
Order order = orderService.selectByNo(orderNo);
@@ -1328,7 +1328,7 @@
plaService.updateById(pla);
SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,null,null,
- pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla鎵嬪姩鍑哄簱鍓�:" + beforeWeightAnfme +",鍑哄簱锛�" + anfme);
+ pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla鎵嬪姩鍑哄簱鍓�:" + beforeWeightAnfme +",鍑哄簱锛�" + anfme,pla.getMemo(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);
}
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 315a19e..e5652dc 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,"鍏ュ簱"+ dto.getCount());
+ null,null,null,null,null,null,"鍏ュ簱"+ dto.getCount(),"",0);
manLocDetlService.insert(manLocDetl);
}else {
// check.setAnfme(dto.getCount() + check.getAnfme());
@@ -166,7 +166,7 @@
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,"鍑哄簱鍓嶅墿浣欙細" + manLocDetl.getAnfme()+",鍑哄簱锛�"+param.getCount());
+ null,null,null,null,null,null,"鍑哄簱鍓嶅墿浣欙細" + manLocDetl.getAnfme()+",鍑哄簱锛�"+param.getCount(),"",0);
manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
.eq("loc_no",node.getUuid())
.eq("matnr",param.getMatnr()));
@@ -178,7 +178,7 @@
.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,"鍑哄簱鍓嶅墿浣欙細"+beforeWeightAnfme+"锛屽嚭搴擄細"+param.getCount());
+ null,null,null,null,null,null,"鍑哄簱鍓嶅墿浣欙細"+beforeWeightAnfme+"锛屽嚭搴擄細"+param.getCount(),"",0);
}
}
}
@@ -209,7 +209,7 @@
source.setNodeId(targetNode.getId());
SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername(),
- null,null,null,null,null,null,"绉诲簱鏁伴噺锛�" + source.getAnfme());
+ null,null,null,null,null,null,"绉诲簱鏁伴噺锛�" + source.getAnfme(),"",0);
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 fcb33a3..76cb5bf 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -147,7 +147,7 @@
this.updateById(pla);
SaasUtils.insertLog(4,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
- null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"閫�鍥炲墠锛�"+beforeWeightAnfme+"锛岄��鍥炲悗锛�"+pla.getWeightAnfme());
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"閫�鍥炲墠锛�"+beforeWeightAnfme+"锛岄��鍥炲悗锛�"+pla.getWeightAnfme(),pla.getMemo(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);
});
}
diff --git a/src/main/java/com/zy/asrs/utils/SaasUtils.java b/src/main/java/com/zy/asrs/utils/SaasUtils.java
index 7b88c2d..ca8ce21 100644
--- a/src/main/java/com/zy/asrs/utils/SaasUtils.java
+++ b/src/main/java/com/zy/asrs/utils/SaasUtils.java
@@ -22,7 +22,8 @@
* @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 memo){
+ String user,String targetLocNo,String batch,Integer packageNo,String owner,String workshop, Long docType,String memo
+ ,String memo2, Integer subcontracting){
SaasLogService bean = SpringUtils.getBean(SaasLogService.class);
SaasLog saasLog = new SaasLog();
saasLog.setType(type);
@@ -39,6 +40,8 @@
saasLog.setWorkshop(workshop);
saasLog.setDocType(docType);
saasLog.setMemo(memo);
+ saasLog.setMemo2(memo2);
+ saasLog.setSubcontracting(subcontracting);
bean.insert(saasLog);
}
}
diff --git a/src/main/java/com/zy/system/controller/SaasLogController.java b/src/main/java/com/zy/system/controller/SaasLogController.java
index c3ab13e..e56b8c7 100644
--- a/src/main/java/com/zy/system/controller/SaasLogController.java
+++ b/src/main/java/com/zy/system/controller/SaasLogController.java
@@ -178,7 +178,11 @@
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
+ } else if (entry.getKey().contains("Min")) {
+ wrapper.ge(entry.getKey().substring(0, entry.getKey().length() - 3), val);
+ } else if (entry.getKey().contains("Max")) {
+ wrapper.le(entry.getKey().substring(0, entry.getKey().length() - 3), val);
+ } else{
wrapper.like(entry.getKey(), val);
}
}
diff --git a/src/main/java/com/zy/system/entity/SaasLog.java b/src/main/java/com/zy/system/entity/SaasLog.java
index 2ce8bb3..3c5e503 100644
--- a/src/main/java/com/zy/system/entity/SaasLog.java
+++ b/src/main/java/com/zy/system/entity/SaasLog.java
@@ -80,6 +80,20 @@
@TableField("memo")
private String memo;
+ @TableField("memo2")
+ private String memo2;
+
+ // 鏄惁鍒嗗寘锛岀敓浜ц鍗曞彿涓虹┖鍒欎负鍒嗗寘 0.姝ｅ父,1.鍒嗗寘
+ @TableField("subcontracting")
+ private Integer subcontracting;
+
+ public String getSubcontracting$() {
+ return Cools.isEmpty(this.subcontracting) ? ""
+ : this.subcontracting == 0 ? "姝ｅ父"
+ : this.subcontracting == 1 ? "鍒嗗寘"
+ : String.valueOf(this.subcontracting);
+ }
+
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 ac6615f..972dd61 100644
--- a/src/main/resources/mapper/SaasLogMapper.xml
+++ b/src/main/resources/mapper/SaasLogMapper.xml
@@ -12,7 +12,8 @@
<result column="create_by" property="createBy" />
<result column="create_by_name" property="createByName" />
<result column="memo" property="memo" />
-
+ <result column="memo2" property="memo2" />
+ <result column="subcontracting" property="subcontracting" />
</resultMap>
<select id="selectListSummary" resultType="com.zy.system.entity.SaasLog">
select
diff --git a/src/main/webapp/static/js/saasLog/saasLog.js b/src/main/webapp/static/js/saasLog/saasLog.js
index 71ed7fd..51290c0 100644
--- a/src/main/webapp/static/js/saasLog/saasLog.js
+++ b/src/main/webapp/static/js/saasLog/saasLog.js
@@ -45,6 +45,8 @@
,{field: 'ioTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
,{field: 'createBy', align: 'center',title: '', hide:true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
+ ,{field: 'subcontracting$', align: 'center',title: '鍒嗗寘鍚�'}
+ ,{field: 'memo2', align: 'center',title: '澶囨敞2'}
]],
request: {
diff --git a/src/main/webapp/views/saasLog/saasLog.html b/src/main/webapp/views/saasLog/saasLog.html
index e204972..6fd1ebf 100644
--- a/src/main/webapp/views/saasLog/saasLog.html
+++ b/src/main/webapp/views/saasLog/saasLog.html
@@ -48,9 +48,19 @@
<input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
</div>
</div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="package_no" placeholder="鍖呭彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="package_no" placeholder="鍖呭彿" autocomplete="off">
+ <input class="layui-input" type="text" name="package_noMin" placeholder="鏈�灏忓寘鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="package_noMax" placeholder="鏈�澶у寘鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline" style="width: 300px">
@@ -61,6 +71,15 @@
<input type="text" class="layui-input" name="io_time" id="ID-laydate-range-datetime" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="subcontracting">
+ <option value="">鍒嗗寘鍚�</option>
+ <option value="0">姝ｅ父</option>
+ <option value="1">鍒嗗寘</option>
+ </select>
+ </div>
+ </div>
<div class="layui-inline"> 
<button class="layui-btn icon-btn" lay-filter="search" lay-submit>
<i class="layui-icon"></i>鎼滅储
--
Gitblit v1.9.1