From 3041eb1b0b76b75b916939e77c7ae97a80fe5af3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 07 十一月 2025 10:24:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java | 6 +++++-
src/main/java/com/zy/asrs/controller/BasRgvErrorLogController.java | 20 +++++++++++++-------
src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java | 2 ++
src/main/resources/mapper/WrkDetlLogMapper.xml | 2 ++
src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java | 6 +++++-
src/main/resources/mapper/LocDetlMapper.xml | 6 ++++++
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
src/main/webapp/static/js/pakStore/turnOver.js | 8 ++++----
src/main/java/com/zy/common/web/WcsController.java | 3 +--
9 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java b/src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java
index 3aae3a3..53eb61e 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java
@@ -42,7 +42,11 @@
excludeTrash(param);
convert(param, wrapper);
allLike(BasCrnErrorLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (Cools.isEmpty(orderByField)) {
+ wrapper.orderBy("create_time", false);
+ } else {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basCrnErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java b/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java
index 11a8ec2..816dbf0 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java
@@ -42,7 +42,11 @@
excludeTrash(param);
convert(param, wrapper);
allLike(BasDevpErrorLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (Cools.isEmpty(orderByField)) {
+ wrapper.orderBy("create_time", false);
+ } else {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basDevpErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/BasRgvErrorLogController.java b/src/main/java/com/zy/asrs/controller/BasRgvErrorLogController.java
index 88cf866..2b12861 100644
--- a/src/main/java/com/zy/asrs/controller/BasRgvErrorLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasRgvErrorLogController.java
@@ -32,17 +32,23 @@
@RequestMapping(value = "/basRgvErrorLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<BasRgvErrorLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasRgvErrorLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+
+ if (Cools.isEmpty(orderByField)) {
+ wrapper.orderBy("create_time", false);
+ } else {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+
return R.ok(basRgvErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java b/src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java
index 3563fc9..9a79ea1 100644
--- a/src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java
+++ b/src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java
@@ -12,4 +12,6 @@
private String matnr;
private Integer owner;
private Integer payment;
+ private String sku;
+ private String supp;
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index d46960d..5550701 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -256,8 +256,7 @@
}
return workNo;
}
- @PostMapping("/auto/銆�" +
- "TransplantingOut/v1")
+ @PostMapping("/auto/TransplantingOut/v1")
@ResponseBody
public R autoTransplantingOut(@RequestBody TransplantWork transplantWork){
// 婧愮珯鐐圭姸鎬佹娴�
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 6b10d25..51690b8 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -265,6 +265,12 @@
<if test="payment != null">
and t.payment = #{payment}
</if>
+ <if test="sku != null">
+ and t.sku = #{sku}
+ </if>
+ <if test="supp != null">
+ and t.supp = #{supp}
+ </if>
</sql>
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index ceb61b7..4c847ec 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -51,6 +51,8 @@
<result column="box_type1" property="boxType1" />
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
+ <result column="owner" property="owner"/>
+ <result column="uuid" property="uuid"/>
</resultMap>
<sql id="batchSeq">
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index be5ae53..23fd172 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -72,7 +72,7 @@
or (wrk_sts=15 and take_none = '1' and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp) and wrk_no not in (select wrk_no from asr_wrk_mast_sta))
or (wrk_sts=15 and dateadd(mi,3,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_no in (9997,9996) and wrk_sts = 5)
+ or (wrk_no in (9997,9996) and wrk_sts = 15)
order by io_time,wrk_no asc
</select>
diff --git a/src/main/webapp/static/js/pakStore/turnOver.js b/src/main/webapp/static/js/pakStore/turnOver.js
index 602c13e..522f099 100644
--- a/src/main/webapp/static/js/pakStore/turnOver.js
+++ b/src/main/webapp/static/js/pakStore/turnOver.js
@@ -35,14 +35,14 @@
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺',hide: true}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺',hide: false}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜',hide: false}
,{field: 'specs', align: 'center',title: '瑙勬牸',hide: true}
- ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: true}
,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��', hide: false}
- ,{field: 'standby1', align: 'center',title: 'po', hide: false}
- ,{field: 'standby2', align: 'center',title: 'upc', hide: false}
+ ,{field: 'supp', align: 'center',title: 'po', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
]],
done: function(res, curr, count) {
--
Gitblit v1.9.1