From c8d0aaf6a77a28d8d934d6ccbcae3560296b3c09 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期六, 08 十一月 2025 13:02:29 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkDetlLogMapper.xml | 6 +++
src/main/webapp/views/wrkDetl/wrkDetl.html | 2
src/main/webapp/views/wrkMast/wrkMast.html | 4 +-
src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java | 9 ++--
src/main/java/com/zy/common/properties/SystemProperties.java | 2
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 4 +-
src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java | 4 ++
src/main/webapp/static/js/wrkMast/wrkMast.js | 2
src/main/java/com/zy/asrs/service/WrkDetlLogService.java | 4 +-
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 10 ++++-
src/main/webapp/views/wrkDetlLog/wrkDetlLog.html | 20 +++++-----
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4 +-
src/main/resources/license.lic | 0
13 files changed, 44 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index a9bcd5f..425fd20 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -84,6 +84,8 @@
String zpallet = null;
String batch = null;
String model = null;
+ String unit = null;
+ String brand = null;
Double anfme = null;
Date modiTimeStart = null, modiTimeEnd = null;
for (Map.Entry<String, Object> entry : param.entrySet()) {
@@ -111,11 +113,15 @@
matnr = val;
}else if (entry.getKey().equals("model")) {
model = val;
+ }else if (entry.getKey().equals("unit")) {
+ unit = val;
+ }else if (entry.getKey().equals("brand")) {
+ brand = val;
}
}
- List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd, curr, limit);
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,model,unit,anfme,brand, modiTimeStart, modiTimeEnd, curr, limit);
Page<WrkDetlLog> page1 = new Page<WrkDetlLog>(curr, limit).setRecords(wrkDetlLogs);
- page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd));
+ page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,model,unit,anfme,brand, modiTimeStart, modiTimeEnd));
return R.ok(page1);
} catch (Exception e) {
return R.error("寮傚父" + e);
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
index 4860d03..53a756a 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
@@ -24,7 +24,9 @@
@Param("zpallet") String zpallet,
@Param("batch") String batch,
@Param("model") String model,
+ @Param("unit") String unit,
@Param("anfme") Double anfme,
+ @Param("brand") String brand,
@Param("modiTimeStart") Date modiTimeStart,
@Param("modiTimeEnd") Date modiTimeEnd,
@Param("pageNumber") Integer curr,
@@ -37,7 +39,9 @@
@Param("zpallet") String zpallet,
@Param("batch") String batch,
@Param("model") String model,
+ @Param("unit") String unit,
@Param("anfme") Double anfme,
+ @Param("brand") String brand,
@Param("modiTimeStart") Date modiTimeStart,
@Param("modiTimeEnd") Date modiTimeEnd);
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
index 0f81bd0..0f3edf3 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
@@ -10,8 +10,8 @@
boolean save(Integer workNo);
- List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
+ List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,String unit,Double anfme,String brand, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
- Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd);
+ Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,String unit,Double anfme,String brand, Date modiTimeStart, Date modiTimeEnd);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index acdeab6..82470a0 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1599,8 +1599,8 @@
matList.setStockType(wrkMast.getStaNo() == 2041 ? "杩斾慨鍑哄簱" : "鎴愬搧鍑哄簱");
matList.setBoxType(wrkDetl.getColor());
matList.setRollType(wrkDetl.getManu());
- matList.setWideInWidth(wrkDetl.getSku());
- matList.setThickness(wrkDetl.getItemNum());
+ matList.setWideInWidth(wrkDetl.getItemNum());
+ matList.setThickness(wrkDetl.getSku());
List<GwmsGenerateInventoryDto.Rolls> rollsList = new ArrayList<>();
GwmsGenerateInventoryDto.Rolls roll = new GwmsGenerateInventoryDto.Rolls(wrkDetl.getModel(),
wrkDetl.getUnit(), wrkDetl.getMaktx(), wrkDetl.getLength(),
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
index 6fd87d0..e74ac4d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
@@ -17,13 +17,14 @@
return this.baseMapper.save(workNo) > 0;
}
+
@Override
- public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
- return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd, curr, limit);
+ public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,String unit,Double anfme,String brand, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
+ return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,model,unit,anfme,brand, modiTimeStart, modiTimeEnd, curr, limit);
}
@Override
- public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd) {
- return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd);
+ public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,String unit,Double anfme,String brand, Date modiTimeStart, Date modiTimeEnd) {
+ return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,model,unit,anfme,brand, modiTimeStart, modiTimeEnd);
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index c58412d..1f6c3ec 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -531,8 +531,8 @@
matList.setStockType(wrkMast.getWhsType() == 1 ? "杩斾慨鍏ュ簱" : "鎴愬搧鍏ュ簱");
matList.setBoxType(wrkDetl.getColor());
matList.setRollType(wrkDetl.getManu());
- matList.setWideInWidth(wrkDetl.getSku());
- matList.setThickness(wrkDetl.getItemNum());
+ matList.setWideInWidth(wrkDetl.getItemNum());
+ matList.setThickness(wrkDetl.getSku());
List<GwmsGenerateInventoryDto.Rolls> rollsList = new ArrayList<>();
GwmsGenerateInventoryDto.Rolls roll = new GwmsGenerateInventoryDto.Rolls(wrkDetl.getModel(),
wrkDetl.getUnit(), wrkDetl.getMaktx(), wrkDetl.getLength(),
diff --git a/src/main/java/com/zy/common/properties/SystemProperties.java b/src/main/java/com/zy/common/properties/SystemProperties.java
index 1d0b240..9581f8a 100644
--- a/src/main/java/com/zy/common/properties/SystemProperties.java
+++ b/src/main/java/com/zy/common/properties/SystemProperties.java
@@ -63,7 +63,7 @@
// 鐢熸垚婵�娲荤爜
public static void main(String[] args) {
- String timeStr = "2099-09-26 08:00:00";
+ String timeStr = "2099-10-26 08:00:00";
Date exprTime = DateUtils.convert(timeStr);
String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
System.out.println("婵�娲荤爜锛�"+code);
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index cae0a39..c2ae965 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index a304a2a..14db210 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -79,6 +79,12 @@
<if test="specs != null and specs != ''">
and a.specs like concat('%',#{specs},'%')
</if>
+ <if test="unit != null and unit != ''">
+ and a.unit like concat('%',#{unit},'%')
+ </if>
+ <if test="brand != null and brand != ''">
+ and a.brand like concat('%',#{brand},'%')
+ </if>
</sql>
<select id="selectWrkDetlLogs" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 4a16ed4..e53387a 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -60,7 +60,7 @@
// ,{field: 'refIotime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true, width: 160}
- // ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'logErrMemo', align: 'center',title: '寮傚父淇℃伅'}
//
// ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
// var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
diff --git a/src/main/webapp/views/wrkDetl/wrkDetl.html b/src/main/webapp/views/wrkDetl/wrkDetl.html
index 5147099..6392925 100644
--- a/src/main/webapp/views/wrkDetl/wrkDetl.html
+++ b/src/main/webapp/views/wrkDetl/wrkDetl.html
@@ -31,7 +31,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="绠卞彿" autocomplete="off">
+ <input class="layui-input" type="text" name="unit" placeholder="绠卞彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
index b855c1a..51e07e8 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
@@ -30,16 +30,16 @@
<input class="layui-input" type="text" name="matnr" placeholder="瑙勬牸" autocomplete="off">
</div>
</div>
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="brand" placeholder="鍖呰鍙�" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="unit" placeholder="绠卞彿" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="brand" placeholder="鍖呰鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="unit" placeholder="绠卞彿" autocomplete="off">
+ </div>
+ </div>
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="model" placeholder="鍗峰彿" autocomplete="off">
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 53c9853..272d9a2 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -124,7 +124,7 @@
<a class="layui-btn layui-btn-danger layui-btn-xs btn-cancel" lay-event="complete">瀹屾垚</a>
<a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a>
-<!-- <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">缁存姢鐘舵��</a>-->
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">缁存姢鐘舵��</a>
{{#if (d.ioType === 103) { }}
<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鎷�</a>
@@ -138,7 +138,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js?v=1" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js?v=3" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
--
Gitblit v1.9.1