From 0d2609a7d5f0c954bc708281518f03beb5f1c014 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 15 九月 2023 13:50:53 +0800
Subject: [PATCH] #日志
---
src/main/webapp/static/js/report/inOut.js | 2 +-
src/main/java/com/zy/asrs/controller/AdjDetlController.java | 13 ++++++++++---
src/main/webapp/static/js/adjDetl/adjDetl.js | 12 ++++++------
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 5 +++--
src/main/resources/mapper/ViewInOutMapper.xml | 4 ++--
5 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AdjDetlController.java b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
index 1405ead..250c640 100644
--- a/src/main/java/com/zy/asrs/controller/AdjDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
@@ -13,6 +13,8 @@
import com.zy.asrs.entity.AdjDetl;
import com.zy.asrs.service.AdjDetlService;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.SaasLog;
+import com.zy.system.service.SaasLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -26,6 +28,9 @@
@Autowired
private AdjDetlService adjDetlService;
+
+ @Autowired
+ private SaasLogService saasLogService;
@RequestMapping(value = "/adjDetl/{id}/auth")
@ManagerAuth
@@ -41,12 +46,14 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
+ //浠ュ墠鏄珛搴撳簱瀛樿皟鏁存帴鍙ｏ紝鍚庢敼涓哄钩搴撹皟鏁存帴鍙�
excludeTrash(param);
- EntityWrapper<AdjDetl> wrapper = new EntityWrapper<>();
+ EntityWrapper<SaasLog> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- allLike(AdjDetl.class, param.keySet(), wrapper, condition);
+ wrapper.eq("type",2);
+ allLike(SaasLog.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(adjDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(saasLogService.selectPage(new Page<>(curr, limit), wrapper));
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
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 e99b217..5e4e901 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -199,10 +199,11 @@
}
ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
.eq("loc_no", targetNode.getUuid())
- .eq("matnr", source.getMatnr()));
+ .eq("matnr", source.getMatnr())
+ .eq("batch",source.getBatch()));
if (check == null) {
manLocDetlService.delete(new EntityWrapper<ManLocDetl>().eq("loc_no", source.getLocNo())
- .eq("matnr", source.getMatnr()));
+ .eq("matnr", source.getMatnr()).eq("batch",source.getBatch()));
source.setLocNo(targetNode.getUuid());
source.setNodeId(targetNode.getId());
diff --git a/src/main/resources/mapper/ViewInOutMapper.xml b/src/main/resources/mapper/ViewInOutMapper.xml
index 8152776..7c931ee 100644
--- a/src/main/resources/mapper/ViewInOutMapper.xml
+++ b/src/main/resources/mapper/ViewInOutMapper.xml
@@ -24,7 +24,7 @@
<select id="queryViewInOutList" parameterType="com.zy.asrs.entity.ViewInOutBean" resultType="com.zy.asrs.entity.ViewInOutBean">
select * from (
select *,ROW_NUMBER() OVER(Order by ymd desc) as rowid
- from asr_sta_inout_view
+ from man_loc_InOut_view
<where>
1=1
<include refid="viewInOutConditionSql"></include>
@@ -39,7 +39,7 @@
</select>
<select id="getViewInOutCount" parameterType="com.zy.asrs.entity.ViewInOutBean" resultType="Integer">
-select count(1) from asr_sta_inout_view a
+select count(1) from man_loc_InOut_view a
<where>
<![CDATA[
1=1
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index cf5c1f8..83564f5 100644
--- a/src/main/webapp/static/js/adjDetl/adjDetl.js
+++ b/src/main/webapp/static/js/adjDetl/adjDetl.js
@@ -23,16 +23,16 @@
// {field: 'adjId', align: 'center',title: '搴忓彿'}
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ // ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
// ,{field: 'oriCtns', align: 'center',title: '鍘熺鏁�'}
- ,{field: 'oriQty', align: 'center',title: '鍘熸暟閲�'}
+ //,{field: 'oriQty', align: 'center',title: '鍘熸暟閲�'}
// ,{field: 'oriWt', align: 'center',title: '鍘熼噸閲�'}
// ,{field: 'adjCtns', align: 'center',title: '鍙樻洿绠辨暟'}
- ,{field: 'adjQty', align: 'center',title: '鍙樻洿鏁伴噺'}
+ ,{field: 'anfme', align: 'center',title: '鍙樻洿鏁伴噺'}
// ,{field: 'adjWt', align: 'center',title: '鍙樻洿閲嶉噺'}
- ,{field: 'memo', align: 'center',title: '澶囨敞',hide:true}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'type$', align: 'center',title: '绫诲瀷'}
+ ,{field: 'createByName', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'ioTime$', align: 'center',title: '淇敼鏃堕棿'}
// ,{field: 'appeUser', align: 'center',title: '鍒涘缓鑰�'}
// ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
diff --git a/src/main/webapp/static/js/report/inOut.js b/src/main/webapp/static/js/report/inOut.js
index e7dff96..287ade6 100644
--- a/src/main/webapp/static/js/report/inOut.js
+++ b/src/main/webapp/static/js/report/inOut.js
@@ -19,7 +19,7 @@
cols: [[
// {type: 'checkbox'}
{field: 'ymd', align: 'center', title: '鏃ユ湡'}
- ,{field: 'source_sta_no', align: 'center',title: '绔欑偣'}
+
,{field: 'sto_qty', align: 'center',title: '鍏ュ簱娆℃暟'}
,{field: 'ret_qty', align: 'center',title: '鍑哄簱娆℃暟'}
,{field: 'total_qty', align: 'center',title: '鍏ュ嚭鎬绘暟'}
--
Gitblit v1.9.1