From 41dfe966bbc15027ab121385a04d825833cdd56d Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期三, 31 七月 2024 11:46:45 +0800
Subject: [PATCH] 按客户需求，页面添加显示字段，将15分钟改成5分钟
---
src/main/resources/mapper/LocDetlMapper.xml | 22 +++++-----
src/main/resources/mapper/WrkMastMapper.xml | 2
src/main/java/com/zy/asrs/entity/ViewInOutBean.java | 3 +
src/main/webapp/views/report/viewInOut.html | 26 +++++++-----
src/main/java/com/zy/asrs/controller/MobileController.java | 3 -
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 1
src/main/java/com/zy/common/web/WcsController.java | 18 ++++++++-
src/main/webapp/static/js/locDetl/locDetl.js | 4 +
src/main/webapp/static/js/report/inOut.js | 11 +++++
src/main/java/com/zy/asrs/entity/LocDetl.java | 5 ++
src/main/java/com/zy/asrs/entity/WrkDetl.java | 6 +++
src/main/java/com/zy/third/erp/task/ERPInOrOutService.java | 2
src/main/webapp/static/js/common.js | 4 +
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 6 +++
14 files changed, 82 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 5e78714..9718208 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -193,7 +193,6 @@
if (Cools.isEmpty(barcode)) {
return R.ok();
}
- System.out.println(barcode);
if (!Cools.isEmpty(barcode)) {
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
return R.ok().add(wrkDetls);
@@ -445,7 +444,7 @@
CombBillQueryVo vo = new CombBillQueryVo();
vo.setMatnr(waitMatin.getMatnr());
vo.setMatName(waitMatin.getMaktx());
- vo.setQty(waitMatin.getAnfme());
+ vo.setQty(waitMatin.getAnfme() - waitMatin.getWorkQty());
vo.setCount(waitMatin.getAnfme() - waitMatin.getWorkQty());
vo.setBillNo(waitMatin.getOrderNo());
vo.setSeqNo(waitMatin.getINo());
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index cd42ffc..a3bccc2 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -128,6 +128,12 @@
ViewInOutBean bean = new ViewInOutBean();
bean.setPageSize(limit);
bean.setPageNumber(curr);
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ String queryDate = (String) param.get("query_date");
+ String[] split = queryDate.split(" - ");
+ bean.setBegin_date(split[0]);
+ bean.setEnd_date(split[1]);
+ }
List<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(bean);
int count = reportQueryMapper.getViewInOutCount(bean);
Page<ViewInOutBean> page = new Page<>();
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index a4d9a1b..4d19ccb 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -195,6 +195,11 @@
@TableField("packing")
private String packing;
+ @TableField("ware_id")
+ private String wareId;
+
+ @TableField("ware_name")
+ private String wareName;
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
diff --git a/src/main/java/com/zy/asrs/entity/ViewInOutBean.java b/src/main/java/com/zy/asrs/entity/ViewInOutBean.java
index 27fdb86..5a0c61d 100644
--- a/src/main/java/com/zy/asrs/entity/ViewInOutBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewInOutBean.java
@@ -1,10 +1,13 @@
package com.zy.asrs.entity;
+import lombok.Data;
+
/**
* 鏃ュ嚭鍏ュ簱娆℃暟缁熻
* @author admin
* @date 2018骞�11鏈�24鏃�
*/
+@Data
public class ViewInOutBean {
private String ymd;
private String source_sta_no;
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index da1e097..4c38f0f 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -303,6 +303,12 @@
@TableField("packing")
private String packing;
+ @TableField("ware_id")
+ private String wareId;
+
+ @TableField("ware_name")
+ private String wareName;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index b31a9fc..8802f87 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -44,7 +44,6 @@
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
- System.out.println(DateUtils.convert(new Date()));
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
// 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
if (!Cools.isEmpty(wrkDetls)) {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3798a5f..9cd40d6 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -56,6 +56,9 @@
@Autowired
private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -359,8 +362,19 @@
wrkDetl.setModiTime(now);
if (!Cools.isEmpty(waitPakin.getOrderNo())) {
Order order = orderService.selectByNo(waitPakin.getOrderNo());
- wrkDetl.setSPgNO(order.getTemp2());
-
+ if (order != null) {
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), waitPakin.getBatch());
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), null);
+ }
+ wrkDetl.setSPgNO(order.getTemp2());
+ wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
+ wrkDetl.setLuHao(orderDetl.getLuHao());
+ wrkDetl.setPacking(orderDetl.getPacking());
+ wrkDetl.setColor(orderDetl.getColor());
+ wrkDetl.setWareId(orderDetl.getWareId());
+ wrkDetl.setWareName(orderDetl.getWareName());
+ }
}
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
diff --git a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
index aff3acf..ec560d4 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
@@ -67,7 +67,7 @@
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
inHedTB.getBillNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(inHedTB.getMakeDate()), // 鍗曟嵁鏃ユ湡
+ DateUtils.convert(inHedTB.getBillDate()), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
null, //
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index f99797f..36453f0 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -478,22 +478,22 @@
and asrsQty != erpQty
</if>
<if test="different != null and different == 0 ">
- and asrsQty = erpQty
+
</if>
- <if test="matnr != null">
- AND matnr like #{matnr}
+ <if test="matnr != null and matnr != ''">
+ AND matnr like '%' + #{matnr}+ '%'
</if>
- <if test="maktx != null">
- AND maktx like #{maktx}
+ <if test="maktx != null and maktx != ''">
+ AND maktx like '%' + #{maktx}+ '%'
</if>
- <if test="specs != null">
- AND specs like #{specs}
+ <if test="specs != null and specs != ''">
+ AND specs like '%' + #{specs}+ '%'
</if>
- <if test="sPgNO != null">
- AND pgNO like #{sPgNO}
+ <if test="sPgNO != null and sPgNO != ''">
+ AND pgNO like '%' + #{sPgNO} + '%'
</if>
- <if test="outOrderNo != null">
- AND outOrderNo like #{outOrderNo}
+ <if test="outOrderNo != null and outOrderNo != ''">
+ AND outOrderNo like '%' + #{outOrderNo} + '%'
</if>
</select>
</mapper>
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index ce04079..ae19ba0 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -70,7 +70,7 @@
select * from asr_wrk_mast
where wrk_sts=5
or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and dateadd(mi,5,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))
order by io_time,wrk_no asc
</select>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 46ea422..9999e33 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -226,7 +226,9 @@
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '鎵规', sort:true}
+ ,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', sort:true}
+ ,{field: 'outOrderNo', align: 'center',title: '鎵规', sort:true}
+ ,{field: 'spgNO', align: 'center',title: '璁㈠崟鍙�', sort:true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 959a33d..3095a0f 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -6,8 +6,10 @@
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'model', align: 'center',title: '浠ｇ爜'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ ,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 200, sort:true}
+ ,{field: 'outOrderNo', align: 'center',title: '璁㈠崟鍙�', hide: true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'specs', 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..5c8ef7e 100644
--- a/src/main/webapp/static/js/report/inOut.js
+++ b/src/main/webapp/static/js/report/inOut.js
@@ -116,6 +116,17 @@
pageCurr = 1;
tableReload(false);
});
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'date'
+ ,range: true
+ });
});
// 鍏抽棴鍔ㄤ綔
diff --git a/src/main/webapp/views/report/viewInOut.html b/src/main/webapp/views/report/viewInOut.html
index 440e00d..0e9c735 100644
--- a/src/main/webapp/views/report/viewInOut.html
+++ b/src/main/webapp/views/report/viewInOut.html
@@ -19,18 +19,22 @@
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
- <!--<div class="layui-inline">-->
- <!--<label class="layui-form-label">搴� 浣� 鍙凤細</label>-->
- <!--<div class="layui-input-inline">-->
- <!--<input class="layui-input" type="text" name="id" placeholder="璇疯緭鍏�" autocomplete="off">-->
- <!--</div>-->
- <!--</div>-->
-
- <!-- 寰呮坊鍔� -->
-<!-- <div id="data-search-btn" class="layui-btn-container layui-form-item">-->
-<!-- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>-->
-<!-- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>-->
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label">搴� 浣� 鍙凤細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="id" placeholder="璇疯緭鍏�" autocomplete="off">-->
+<!-- </div>-->
<!-- </div>-->
+
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 290px">
+ </div>
+ </div>
+ <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
</div>
<!-- 琛ㄦ牸 -->
--
Gitblit v1.9.1