From e2d71a5f83e70e0d419a3b793f9fd51de72b9fe1 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 24 九月 2024 08:53:11 +0800
Subject: [PATCH] bug修改完成
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java | 3
zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml | 3
zy-asrs-wms/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 8
zy-asrs-wms/src/main/webapp/views/report/viewWorkOut.html | 5
zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml | 3
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java | 2
zy-asrs-wms/src/main/webapp/views/waitPakinLog/waitPakinLog.html | 2
zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js | 2
zy-asrs-wms/src/main/webapp/views/report/viewWorkIn.html | 5
zy-asrs-wcs/src/main/webapp/views/crn.html | 12 +-
zy-asrs-wms/src/main/webapp/views/pakStore/emptyOut.html | 10
zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java | 199 ++++++++++++++++----------------
zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html | 10
zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog_detail.html | 26 ++--
zy-asrs-wms/src/main/webapp/views/report/viewStayTime.html | 6
zy-asrs-wms/src/main/webapp/static/js/report/workOut.js | 4
zy-asrs-wms/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html | 2
zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html | 22 +-
zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js | 2
zy-asrs-wms/src/main/webapp/views/locMast/locMast_detail.html | 12 +-
zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast_detail.html | 2
22 files changed, 185 insertions(+), 157 deletions(-)
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml
index 9177994..04e1c8d 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml
@@ -11,6 +11,9 @@
<if test="viewStayTime.matnr!=null and viewStayTime.matnr!='' ">
and wms_loc_detl.matnr like '%' + #{viewStayTime.matnr} + '%'
</if>
+ <if test="viewStayTime.zpallet!=null and viewStayTime.zpallet!='' ">
+ and wms_loc_detl.zpallet like '%' + #{viewStayTime.zpallet} + '%'
+ </if>
</sql>
<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
index a8c311c..c4e311b 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
@@ -11,6 +11,9 @@
<if test="viewWorkIn.matnr!=null and viewWorkIn.matnr!='' ">
and matnr like '%' + #{viewWorkIn.matnr} + '%'
</if>
+ <if test="viewWorkIn.zpallet!=null and viewWorkIn.zpallet!='' ">
+ and zpallet like '%' + #{viewWorkIn.zpallet} + '%'
+ </if>
<if test="viewWorkIn.maktx!=null and viewWorkIn.maktx!='' ">
and (maktx like '%' + #{viewWorkIn.maktx} + '%'
or matnr like '%' + #{viewWorkIn.maktx} + '%'
diff --git a/zy-asrs-wcs/src/main/webapp/views/crn.html b/zy-asrs-wcs/src/main/webapp/views/crn.html
index 8fa4b8c..417f5f5 100644
--- a/zy-asrs-wcs/src/main/webapp/views/crn.html
+++ b/zy-asrs-wcs/src/main/webapp/views/crn.html
@@ -121,12 +121,12 @@
<!-- 璁惧浠诲姟閫夋嫨 -->
<div class="task-select">
<!-- 鍫嗗灈鏈洪�夋嫨 -->
- <div id="crn-select" class="operator-item">
- <span class="select-title">鍫嗗灈鏈哄彿</span>
- <div class="select-container">
- <label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
- </div>
- </div>
+<!-- <div id="crn-select" class="operator-item">-->
+<!-- <span class="select-title">鍫嗗灈鏈哄彿</span>-->
+<!-- <div class="select-container">-->
+<!-- <label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>-->
+<!-- </div>-->
+<!-- </div>-->
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
<div id="source-select" class="operator-item">
<span class="select-title">婧愮珯/婧愬簱浣�</span>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java
index fb3c929..a30cbd2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java
@@ -24,6 +24,7 @@
/**
* 鏃ュ織缁熻鎺у埗鍣ㄥ眰
+ *
* @author admin
* @date 2018骞�11鏈�23鏃�
*/
@@ -31,113 +32,115 @@
@RequestMapping("/report")
public class ReportQueryController extends BaseController {
- @Autowired
- private ReportQueryMapper reportQueryMapper;
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
- //------------------搴撲綅浣跨敤缁熻--------------------------------------
- @RequestMapping("/viewStockUseList.action")
- public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewStockUseBean bean = new ViewStockUseBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
+ //------------------搴撲綅浣跨敤缁熻--------------------------------------
+ @RequestMapping("/viewStockUseList.action")
+ public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ ViewStockUseBean bean = new ViewStockUseBean();
+ bean.setPageSize(limit);
+ bean.setPageNumber(curr);
- Page<ViewStockUseBean> page = new Page<>(curr, limit);
- IPage<ViewStockUseBean> list = reportQueryMapper.queryViewStockUseList(page, bean);
- return R.ok(list);
- }
+ Page<ViewStockUseBean> page = new Page<>(curr, limit);
+ IPage<ViewStockUseBean> list = reportQueryMapper.queryViewStockUseList(page, bean);
+ return R.ok(list);
+ }
- // 瀵煎嚭
- @RequestMapping(value = "/viewStockUseExport.action")
- @ManagerAuth(memo = "搴撲綅浣跨敤缁熻瀵煎嚭")
- public R viewStockUseExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- List<ViewStockUseBean> list = reportQueryMapper.getViewStockUseAll(new ViewStockUseBean());
- return R.ok(exportSupport(list, fields));
- }
+ // 瀵煎嚭
+ @RequestMapping(value = "/viewStockUseExport.action")
+ @ManagerAuth(memo = "搴撲綅浣跨敤缁熻瀵煎嚭")
+ public R viewStockUseExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ List<ViewStockUseBean> list = reportQueryMapper.getViewStockUseAll(new ViewStockUseBean());
+ return R.ok(exportSupport(list, fields));
+ }
- //------------------搴撳瓨婊炵暀缁熻--------------------------------------
- @RequestMapping("/viewStayTimeList.action")
- public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewStayTimeBean bean = new ViewStayTimeBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
- String locNo = String.valueOf(param.get("locNo"));
- if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
- bean.setLocNo(locNo);
- }
+ //------------------搴撳瓨婊炵暀缁熻--------------------------------------
+ @RequestMapping("/viewStayTimeList.action")
+ public Map<String, Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ ViewStayTimeBean bean = new ViewStayTimeBean();
+ bean.setPageSize(limit);
+ bean.setPageNumber(curr);
+ String locNo = String.valueOf(param.get("locNo"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ bean.setLocNo(locNo);
+ }
+ if (!Cools.isEmpty(param.get("zpallet"))) {
+ bean.setZpallet(String.valueOf(param.get("zpallet")));
+ }
+ Page<ViewStayTimeBean> page = new Page<>(curr, limit);
+ IPage<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(page, bean);
+ return R.ok(list);
+ }
- Page<ViewStayTimeBean> page = new Page<>(curr, limit);
- IPage<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(page, bean);
- return R.ok(list);
- }
+ // 瀵煎嚭
+ @RequestMapping(value = "/viewStayTimeExport.action")
+ @ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
+ public R viewStayTimeExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map map = param.getObject("exportData", Map.class);
+ List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(map);
+ return R.ok(exportSupport(list, fields));
+ }
- // 瀵煎嚭
- @RequestMapping(value = "/viewStayTimeExport.action")
- @ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
- public R viewStayTimeExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map map = param.getObject("exportData", Map.class);
- List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(map);
- return R.ok(exportSupport(list, fields));
- }
+ //------------------绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻--------------------------------------
+ @RequestMapping("/viewInOutList.action")
+ public Map<String, Object> viewInOutList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ ViewInOutBean bean = new ViewInOutBean();
+ bean.setPageSize(limit);
+ bean.setPageNumber(curr);
+ Page<ViewInOutBean> page = new Page<>(curr, limit);
+ IPage<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(page, bean);
+ return R.ok(list);
+ }
- //------------------绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻--------------------------------------
- @RequestMapping("/viewInOutList.action")
- public Map<String,Object> viewInOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewInOutBean bean = new ViewInOutBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
- Page<ViewInOutBean> page = new Page<>(curr, limit);
- IPage<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(page, bean);
- return R.ok(list);
- }
+ //------------------鏃ュ叆搴撴槑缁嗙粺璁�--------------------------------------
+ @RequestMapping("/viewWorkInList.action")
+ public Map<String, Object> viewWorkInList(ViewWorkInBean bean) {
+ Page<ViewWorkInBean> page = new Page<>(bean.getPageNumber(), bean.getPageSize());
+ IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(page, bean);
+ return R.ok(list);
+ }
- //------------------鏃ュ叆搴撴槑缁嗙粺璁�--------------------------------------
- @RequestMapping("/viewWorkInList.action")
- public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
- Page<ViewWorkInBean> page = new Page<>(bean.getPageNumber(), bean.getPageSize());
- IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(page, bean);
- return R.ok(list);
- }
+ //excel瀵煎嚭
+ @RequestMapping("/viewWorkInExport.action")
+ @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
+ public R viewWorkInExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQueryDate(bean.getQueryDate());
+ Map map = JSON.parseObject(JSON.toJSONString(bean), Map.class);
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(map);
+ return R.ok(exportSupport(list, fields));
+ }
- //excel瀵煎嚭
- @RequestMapping("/viewWorkInExport.action")
- @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
- public R viewWorkInExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- @SuppressWarnings("unchecked")
- ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
- bean.setQueryDate(bean.getQueryDate());
- Map map = JSON.parseObject(JSON.toJSONString(bean), Map.class);
- List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(map);
- return R.ok(exportSupport(list, fields));
- }
+ //------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
+ @RequestMapping("/viewWorkOutList.action")
+ public R viewWorkOutList(ViewWorkInBean bean) {
+ Page<ViewWorkInBean> page = new Page<>(bean.getPageNumber(), bean.getPageSize());
+ IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(page, bean);
+ return R.ok(list);
+ }
- //------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
- @RequestMapping("/viewWorkOutList.action")
- public R viewWorkOutList(ViewWorkInBean bean){
- Page<ViewWorkInBean> page = new Page<>(bean.getPageNumber(), bean.getPageSize());
- IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(page, bean);
- return R.ok(list);
- }
-
- //excel瀵煎嚭
- @RequestMapping("/viewWorkOutExport.action")
- @ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗙粺璁″鍑�")
- public R viewWorkOutExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- @SuppressWarnings("unchecked")
- ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
- bean.setQueryDate(bean.getQueryDate());
- Map map = JSON.parseObject(JSON.toJSONString(bean), Map.class);
- List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(map);
- return R.ok(exportSupport(list, fields));
- }
+ //excel瀵煎嚭
+ @RequestMapping("/viewWorkOutExport.action")
+ @ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗙粺璁″鍑�")
+ public R viewWorkOutExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQueryDate(bean.getQueryDate());
+ Map map = JSON.parseObject(JSON.toJSONString(bean), Map.class);
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(map);
+ return R.ok(exportSupport(list, fields));
+ }
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
index 9cf3197..66ac248 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
@@ -40,7 +40,7 @@
excludeTrash(param);
QueryWrapper<WrkMast> wrapper = new QueryWrapper<>();
wrapper.eq("host_id",getHostId());
- System.out.println(param);
+ wrapper.orderByDesc("io_pri");
convert(param, wrapper);
return R.ok(wrkMastService.page(new Page<>(curr, limit), wrapper));
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java
index 35e5835..7031fa0 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java
@@ -136,6 +136,7 @@
locMast.setModiTime(now);
locMast.setPic(wrkMast.getPic());
locMast.setFullPlt(wrkMast.getFullPlt());
+ locMast.setOwner(wrkMast.getOwner());
if (!locMastService.updateById(locMast)) {
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
@@ -238,6 +239,7 @@
locMast.setIoTime(now);
locMast.setModiTime(now);
locMast.setPic(wrkMast.getPic());
+ locMast.setOwner(wrkMast.getOwner());
if (!locMastService.updateById(locMast)) {
exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
@@ -294,6 +296,7 @@
locMast.setIoTime(now);
locMast.setModiTime(now);
locMast.setPic(picUrl);
+ locMast.setOwner(wrkMast.getOwner());
if (!locMastService.updateById(locMast)) {
exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js b/zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js
index dcd0d0e..e77d713 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js
@@ -28,7 +28,7 @@
// ,{field: 'ctnType', align: 'center',title: ''}
// ,{field: 'locSts', align: 'center',title: ''}
// ,{field: 'sheetNo', align: 'center',title: ''}
- ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ //,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�', sort:true}
,{field: 'bay1', align: 'center',title: '鍒�', sort:true}
,{field: 'lev1', align: 'center',title: '灞�', sort:true}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js b/zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js
index cc7f7ec..6bc1c2c 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js
@@ -51,7 +51,7 @@
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
- ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ //,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�'}
,{field: 'bay1', align: 'center',title: '鍒�'}
,{field: 'lev1', align: 'center',title: '灞�'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/report/workOut.js b/zy-asrs-wms/src/main/webapp/static/js/report/workOut.js
index b41df8f..b93f896 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/report/workOut.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/report/workOut.js
@@ -3,8 +3,8 @@
var cols = [
{field: 'ioTime$', align: 'center', title: '鍑哄簱鏃ユ湡', width: 200}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'crnStrTime', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
- ,{field: 'crnEndTime', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
+ ,{field: 'crnStrTime', align: 'center',title: '璁惧鍚姩鏃堕棿'}
+ ,{field: 'crnEndTime', align: 'center',title: '璁惧鍋滄鏃堕棿'}
];
cols.push.apply(cols, detlCols);
return cols;
diff --git a/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js b/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
index 4ee32b0..1ebf4e3 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
@@ -30,7 +30,7 @@
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
- ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ //,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�'}
,{field: 'bay1', align: 'center',title: '鍒�'}
,{field: 'lev1', align: 'center',title: '灞�'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/zy-asrs-wms/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index dd3e5d7..f0811ee 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -3,7 +3,10 @@
var cols = [
];
cols.push.apply(cols, detlCols);
- cols.push({field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
+ cols.push(
+ {field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝ｅ父|閿佸畾' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.status === 'Y'){html += " checked ";}
html += ">";
@@ -15,8 +18,7 @@
html += ">";
return html;
}}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
+ )
return cols;
}
layui.use(['table','laydate', 'form'], function(){
diff --git a/zy-asrs-wms/src/main/webapp/views/locMast/locMast_detail.html b/zy-asrs-wms/src/main/webapp/views/locMast/locMast_detail.html
index 5b183b2..af60202 100644
--- a/zy-asrs-wms/src/main/webapp/views/locMast/locMast_detail.html
+++ b/zy-asrs-wms/src/main/webapp/views/locMast/locMast_detail.html
@@ -77,12 +77,12 @@
<input id="sheetNo" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:80%;">
- <label class="layui-form-label">鍫嗗灈鏈哄彿锛�</label>
- <div class="layui-input-inline">
- <input id="crnNo" class="layui-input" type="text" autocomplete="off" disabled="disabled">
- </div>
- </div>
+<!-- <div class="layui-inline" style="width:80%;">-->
+<!-- <label class="layui-form-label">鍫嗗灈鏈哄彿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="crnNo" class="layui-input" type="text" autocomplete="off" disabled="disabled">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline" style="width:80%;">
<label class="layui-form-label">鎺掞細</label>
<div class="layui-input-inline">
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/emptyOut.html b/zy-asrs-wms/src/main/webapp/views/pakStore/emptyOut.html
index 234d821..dd67719 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/emptyOut.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/emptyOut.html
@@ -94,11 +94,11 @@
<input class="layui-input" type="text" name="lev1" placeholder="灞�" lay-verify="number" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="crn_no" placeholder="鍫嗗灈鏈哄彿" lay-verify="number" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="crn_no" placeholder="鍫嗗灈鏈哄彿" lay-verify="number" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 00e8877..5fd26c3 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -46,11 +46,11 @@
<legend>鎼滅储鏍�</legend>
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="crn_no" placeholder="鍫嗗灈鏈哄彿" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="crn_no" placeholder="鍫嗗灈鏈哄彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
diff --git a/zy-asrs-wms/src/main/webapp/views/report/viewStayTime.html b/zy-asrs-wms/src/main/webapp/views/report/viewStayTime.html
index 697669b..be53c30 100644
--- a/zy-asrs-wms/src/main/webapp/views/report/viewStayTime.html
+++ b/zy-asrs-wms/src/main/webapp/views/report/viewStayTime.html
@@ -24,7 +24,11 @@
<input class="layui-input" type="text" name="locNo" placeholder="搴撲綅鍙�" autocomplete="off">
</div>
</div>
-
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
diff --git a/zy-asrs-wms/src/main/webapp/views/report/viewWorkIn.html b/zy-asrs-wms/src/main/webapp/views/report/viewWorkIn.html
index d5866ad..c609753 100644
--- a/zy-asrs-wms/src/main/webapp/views/report/viewWorkIn.html
+++ b/zy-asrs-wms/src/main/webapp/views/report/viewWorkIn.html
@@ -26,6 +26,11 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
</div>
</div>
diff --git a/zy-asrs-wms/src/main/webapp/views/report/viewWorkOut.html b/zy-asrs-wms/src/main/webapp/views/report/viewWorkOut.html
index eadc785..bee9604 100644
--- a/zy-asrs-wms/src/main/webapp/views/report/viewWorkOut.html
+++ b/zy-asrs-wms/src/main/webapp/views/report/viewWorkOut.html
@@ -26,6 +26,11 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
</div>
</div>
diff --git a/zy-asrs-wms/src/main/webapp/views/waitPakinLog/waitPakinLog.html b/zy-asrs-wms/src/main/webapp/views/waitPakinLog/waitPakinLog.html
index 8de8c2e..8f9a955 100644
--- a/zy-asrs-wms/src/main/webapp/views/waitPakinLog/waitPakinLog.html
+++ b/zy-asrs-wms/src/main/webapp/views/waitPakinLog/waitPakinLog.html
@@ -59,7 +59,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/waitPakinLog/waitPakinLog.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/waitPakinLog/waitPakinLog.js?v=2" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
diff --git a/zy-asrs-wms/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html b/zy-asrs-wms/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
index 3845973..5330771 100644
--- a/zy-asrs-wms/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
+++ b/zy-asrs-wms/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
@@ -85,7 +85,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/wrkDetlLog/wrkDetlLog.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/wrkDetlLog/wrkDetlLog.js?v=1" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
diff --git a/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast_detail.html b/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast_detail.html
index 79601ad..a23c1a0 100644
--- a/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast_detail.html
+++ b/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast_detail.html
@@ -136,7 +136,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label" style="font-size: x-small">鍫嗗灈鏈哄惎鍔ㄦ椂闂达細</label>
+ <label class="layui-form-label" style="font-size: x-small">璁惧鍚姩鏃堕棿锛�</label>
<div class="layui-input-inline">
<input id="crnStrTime$" class="layui-input" type="text" autocomplete="off">
</div>
diff --git a/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html b/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html
index 5b2978d..424a303 100644
--- a/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html
+++ b/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html
@@ -50,17 +50,17 @@
</div>
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="crnNo" class="layui-input" name="crn_no" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鍫嗗灈鏈哄彿" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="crnNo" class="layui-input" name="crn_no" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">-->
+<!-- <input id="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鍫嗗灈鏈哄彿" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
diff --git a/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog_detail.html b/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog_detail.html
index c6807ff..da8aab5 100644
--- a/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog_detail.html
+++ b/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog_detail.html
@@ -51,18 +51,18 @@
</div>
</div>
</div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鍫嗗灈鏈哄彿锛�</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="crnNo" class="layui-input" type="text" lay-verify="number" style="display: none">
- <input id="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鍫嗗灈鏈哄彿锛�</label>-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="crnNo" class="layui-input" type="text" lay-verify="number" style="display: none">-->
+<!-- <input id="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">浼� 鍏� 绾э細</label>
<div class="layui-input-inline">
@@ -142,7 +142,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label" style="font-size: x-small">鍫嗗灈鏈哄惎鍔ㄦ椂闂达細</label>
+ <label class="layui-form-label" style="font-size: x-small">璁惧鍚姩鏃堕棿锛�</label>
<div class="layui-input-inline">
<input id="crnStrTime$" class="layui-input" type="text" autocomplete="off">
</div>
--
Gitblit v1.9.1