From b4b2da143af53a7422135abffd5306b282be6a39 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 16 四月 2025 09:46:11 +0800
Subject: [PATCH] 2.0版本
---
src/main/webapp/views/locDetl/locDetl.html | 13 -
src/main/java/com/zy/asrs/controller/LocMastController.java | 12 +
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 5
src/main/resources/mapper/LocDetlMapper.xml | 9 +
src/main/webapp/views/mat/mat.html | 23 ---
src/main/webapp/views/pakStore/locDetlQuery.html | 20 +-
src/main/java/com/zy/common/web/WcsController.java | 20 ++
src/main/webapp/static/js/stoMan/stoQue.js | 2
src/main/java/com/zy/asrs/task/PlcLogScheduler.java | 2
src/main/webapp/static/js/report/workOut.js | 8
src/main/webapp/views/wrkDetlLog/wrkDetlLog.html | 32 ++++
src/main/webapp/views/report/viewWorkOut.html | 3
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 1
src/main/java/com/zy/asrs/task/CheckDeepScheduler.java | 24 +-
src/main/java/com/zy/asrs/task/ErrorStockScheduler.java | 2
src/main/java/com/zy/asrs/entity/WrkDetl.java | 4
src/main/webapp/views/stoMan/stoQue.html | 10 +
src/main/webapp/static/js/common.js | 12
src/main/java/com/zy/asrs/controller/LocDetlController.java | 10 +
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 17 ++
src/main/java/com/zy/asrs/controller/OpenController.java | 22 +--
src/main/webapp/static/js/report/workIn.js | 4
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 19 ++
src/main/webapp/views/report/viewWorkIn.html | 5
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 3
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 65 +++-----
src/main/webapp/views/waitPakin/waitPakin.html | 20 ++
27 files changed, 235 insertions(+), 132 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index c227b76..c3e24a7 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -343,4 +343,14 @@
return R.ok(sum);
}
+ @GetMapping("/locDetl/source")
+ public void getSource(){
+ List<LocDetl>list = locDetlService.selectList(null);
+ for (LocDetl locDetl : list) {
+ LocMast locMast = locMastService.selectById(locDetl.getLocNo());
+ locDetl.setSource(locMast.getLocAttribute());
+ locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locDetl.getLocNo()));
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index bbcb7e9..91e3add 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -213,6 +213,18 @@
return R.ok();
}
+ @GetMapping(value = "/locMast/check/column/group1")
+ public void group1() {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",9));
+ for (LocMast locMast : locMasts) {
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1",8).eq("bay1",locMast.getBay1()).eq("lev1",locMast.getLev1()));
+ locMast1.setGroup1(locMast.getGroup1());
+ locMastService.updateById(locMast1);
+ }
+
+
+ }
+
@RequestMapping(value = "/locMast/init/auth")
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
// @Transactional
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 24bd3a6..5d419a7 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -233,13 +233,14 @@
map1.put("ReturnStatus", "1");
map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
} else {
- if (wrkMast.getIoType() == 1) {
+ if (wrkMast.getIoType() == 1||wrkMast.getIoType() == 57|| wrkMast.getIoType() == 53) {
wrkMast.setWrkSts(3L);//鍏ュ簱寮�濮�
- } else if (wrkMast.getIoType() == 11) {
+ } else if (wrkMast.getIoType() == 11 ||wrkMast.getIoType() == 107|| wrkMast.getIoType() == 103 ) {
wrkMast.setWrkSts(13L);//鍑哄簱寮�濮�
}
wrkMast.setModiTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
+ log.info("WMS浠诲姟寮�濮嬫洿鏂�"+wrkMast);
map1.put("ReturnStatus", "0");
map1.put("ErrorMessage", "");
} else {
@@ -279,7 +280,8 @@
wrkMast.setWrkSts(14L);
}
wrkMast.setModiTime(new Date());
- if (wrkMastService.updateById(wrkMast)) {
+ if (wrkMastService.update(wrkMast,new EntityWrapper<WrkMast>().eq("wrk_no",wrkMast.getWrkNo()))) {
+ log.info("WMS浠诲姟瀹屾垚鏇存柊"+wrkMast);
map1.put("ReturnStatus", "0");
map1.put("ErrorMessage", "");
} else {
@@ -296,6 +298,8 @@
return map1;
}
workService.cancelWrkMast(String.valueOf(wrkMast.getWrkNo()),9999L);
+ map1.put("ReturnStatus", "0");
+ map1.put("ErrorMessage", "");
}
}
return map1;
@@ -319,17 +323,7 @@
map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
return map1;
}
- if ((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 110) && wrkMast.getWrkSts() != 14) {
- wrkMast.setWrkSts(14L);//鍑哄簱鍒扮珯鐐逛笂
- wrkMast.setModiTime(new Date());
- if (wrkMastService.updateById(wrkMast)) {
- map1.put("ReturnStatus", "0");
- map1.put("ErrorMessage", "");
- } else {
- map1.put("ReturnStatus", "1");
- map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�" + wrkMast);
- }
- } else if (wrkMast.getIoType() != 101) {
+ if (wrkMast.getIoType() != 101) {
map1.put("ReturnStatus", "0");
map1.put("ErrorMessage", "");
return map1;
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index 517e54d..9e23b8e 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -62,6 +62,9 @@
EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
+ if(!Cools.isEmpty(param.get("anfme"))){
+ wrapper.eq("anfme",param.get("anfme"));
+ }
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
else {
wrapper.orderBy("modi_time", false);
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 349a127..761208a 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -218,9 +218,9 @@
private Integer deadWarn;
/**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ * 娣辨祬搴撲綅
*/
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value= "娣辨祬搴撲綅")
private Integer source;
/**
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index e8c6fb6..b9ae807 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -870,6 +870,7 @@
if (!wrkMastService.updateById(wrkMast)) {
throw new CoolException("鍙栨秷宸ヤ綔妗ｅけ璐�");
}
+
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
throw new CoolException("淇濆瓨宸ヤ綔鍘嗗彶妗ｅけ璐�, workNo = " + wrkMast.getWrkNo());
diff --git a/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java b/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
index db1adb8..cd6811b 100644
--- a/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
+++ b/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
@@ -43,17 +43,17 @@
@Autowired
private CheckDeepHandler checkDeepHandler;
- /**
- * 灏嗕袱涓繁搴撲綅鍚堝苟涓烘繁娴呭簱浣�,鐗╂枡鍙风浉鍚岋紝婧愬簱浣嶅叆搴撴棩鏈熸棭浜庣洰鏍囧簱浣嶅搴旀繁搴撲綅鍏ュ簱鏃ユ湡锛屽簱浣嶇姸鎬侀兘涓篎
- */
- @Scheduled(cron = "0/30 * * * * ?")
- private void execute() throws ParseException {
- if (!confirmDeep) return;
-
- ReturnT<String> result = checkDeepHandler.start();
- if (!result.isSuccess()) {
- log.error("搴撲綅绉昏浆===>>娴呭簱浣嶇Щ杞埌娣卞簱浣嶅け璐�");
- }
- }
+// /**
+// * 灏嗕袱涓繁搴撲綅鍚堝苟涓烘繁娴呭簱浣�,鐗╂枡鍙风浉鍚岋紝婧愬簱浣嶅叆搴撴棩鏈熸棭浜庣洰鏍囧簱浣嶅搴旀繁搴撲綅鍏ュ簱鏃ユ湡锛屽簱浣嶇姸鎬侀兘涓篎
+// */
+// @Scheduled(cron = "0/30 * * * * ?")
+// private void execute() throws ParseException {
+// if (!confirmDeep) return;
+//
+// ReturnT<String> result = checkDeepHandler.start();
+// if (!result.isSuccess()) {
+// log.error("搴撲綅绉昏浆===>>娴呭簱浣嶇Щ杞埌娣卞簱浣嶅け璐�");
+// }
+// }
}
diff --git a/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java b/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java
index 917cfc4..86c1498 100644
--- a/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java
@@ -19,7 +19,7 @@
@Autowired
private ErrorStockHandler errorStockHandler;
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
ReturnT<String> returnT = errorStockHandler.start();
if (!returnT.isSuccess()) {
diff --git a/src/main/java/com/zy/asrs/task/PlcLogScheduler.java b/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
index 708392f..ada5011 100644
--- a/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
@@ -19,7 +19,7 @@
@Autowired
private PlcLogHandler plcLogHandler;
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
ReturnT<String> returnT = plcLogHandler.start();
if (!returnT.isSuccess()) {
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 10bffd4..38dbcb5 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,6 +1,11 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
@@ -25,10 +30,23 @@
private WrkMastService wrkMastService;
@Autowired
private WorkMastHandler workMastHandler;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private LocDetlService locDetlService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
+ //绌哄簱浣嶆暟鎹兘娓呯┖
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","O"));
+ for (LocMast locMast : locMasts) {
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
+ if(locDetl==null){
+ continue;
+ }
+ locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
+ }
if (wrkMasts.isEmpty()) {
return;
}
@@ -43,6 +61,7 @@
}
}
}
+
}
}
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 bca1468..bb7c306 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -263,6 +263,23 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
+ for (WrkDetl wrkDetl:wrkDetls57){
+ LocDetl locDetl = new LocDetl();
+ locDetl.sync(wrkDetl);
+ locDetl.setAnfme(wrkDetl.getAnfme());//鏁伴噺
+ locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+ locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ locDetl.setModiTime(now);
+ locDetl.setAppeTime(now);
+ locDetl.setPrice(0.0);
+ if (null != locDetl) {
+ if (!locDetlService.insert(locDetl)) {
+// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+ }
// 淇敼搴撲綅鐘舵�� S ====>> F
if (locMast.getLocSts().equals("S")) {
locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D");
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index d293842..71e9d6a 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -92,6 +92,15 @@
return storageResult;
}
BasDevp basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",param.getWcsSourceStaNo()));
+ //
+ List<WrkMast> wrkMasts=wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no",param.getWcsSourceStaNo()).in("wrk_sts",11,12,13));
+ if(!Cools.isEmpty(wrkMasts)){
+ storageResult.setReturnStatus(1);
+ storageResult.setErrorMessage("鏈夊嚭搴撲换鍔＄姝㈠叆搴�");
+ basDevp.setArea("鏈夊嚭搴撲换鍔＄姝㈠叆搴�");
+ basDevpService.updateById(basDevp);
+ return storageResult;
+ }
int ioType = 0;
List<WaitPakin> waitPakins = null;
if (param.getWcsIoType() == 1) {
@@ -185,18 +194,21 @@
WaitPakin waitPakin1=new WaitPakin();
waitPakin1.sync(wrkDetl);
locMast1 =commonService.getLocNo2(waitPakin1,arr,0,type,1);
-
+ //鏇存柊璐х墿鎵�鍦ㄥ簱浣嶇殑娣辨祬鍙�
+ wrkDetl.setSource(locMast1.getLocAttribute());
+ wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("wrk_no", wrkDetl.getWrkNo()));
WrkMast wrkMast=wrkMastService.selectByBarcode(barcode);
workNo = wrkMast.getWrkNo();
- int mbz=wrkMast.getStaNo()*10+Integer.valueOf(wrkMast.getSourceLocNo().substring(6));
+ int mbz=basDevp.getDevNo()*10+Integer.valueOf(wrkMast.getSourceLocNo().substring(6));
String ykw=wrkMast.getLocNo();
wrkMast.setIoType(ioType-50);
wrkMast.setWrkSts(1L);//鍏ュ簱
wrkMast.setModiTime(new Date());
- wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
+ wrkMast.setSourceStaNo(basDevp.getDevNo()); // 婧愮珯
wrkMast.setStaNo(mbz); // 鐩爣绔�
wrkMast.setLocNo(locMast1.getLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
wrkMast.setSourceLocNo(ykw); // 婧愬簱浣�
+
wrkMastService.updateById(wrkMast);
}else{
int type=Cools.isEmpty(waitPakins.get(0).getBeBatch())?1:waitPakins.get(0).getBeBatch();
@@ -233,6 +245,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ int source = locMast1.getLocAttribute();
waitPakins.forEach(waitPakin -> {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(waitPakin);
@@ -240,6 +253,7 @@
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
+ wrkDetl.setSource(source);
if (!wrkDetlService.insert(wrkDetl)) {
basDevp.setArea("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
basDevpService.updateById(basDevp);
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 81d23f3..21166f4 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -106,13 +106,20 @@
<if test="crnNo!=null and crnNo!='' ">
and b.crn_no=#{crnNo}
</if>
+ <if test="specs!=null and specs!='' ">
+ and a.specs=#{specs}
+ </if>
+ <if test="model!=null and model!='' ">
+ and a.model=#{model}
+ </if>
+
</sql>
<select id="getStockOutPage" resultMap="BaseResultMap">
select * from
(
select
- ROW_NUMBER() over (order by a.appe_time,a.matnr,a.loc_no) as row,
+ ROW_NUMBER() over (order by a.source desc, a.appe_time,a.matnr,a.loc_no) as row,
a.*
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index deca98e..8ab6016 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -201,13 +201,13 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: false}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: false}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: false}
- ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: false}
+ ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
+ ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
+ ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+ ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
- ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+ ,{field: 'beBatch', align: 'center',title: '鐗规畩鐗╂枡', hide: false}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
@@ -225,7 +225,7 @@
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'batch', align: 'center',title: '鍚堝悓鍙�', sort:true}
+ ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index ccf3fa2..442c8e2 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -2,8 +2,8 @@
function getCol() {
var cols = [
{field: 'ioTime$', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
- ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'model', align: 'center',title: '鍥惧彿'}
+ // ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ // ,{field: 'model', align: 'center',title: '鍥惧彿'}
];
cols.push.apply(cols, detlCols);
return cols;
diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index bc8ecab..3eb7a1a 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -2,10 +2,10 @@
function getCol() {
var cols = [
{field: 'ioTime$', align: 'center', title: '鍑哄簱鏃ユ湡', width: 200}
- ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
- ,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
- ,{field: 'model', align: 'center',title: '鍥惧彿'}
+ // ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ // ,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
+ // ,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
+ // ,{field: 'model', align: 'center',title: '鍥惧彿'}
];
cols.push.apply(cols, detlCols);
return cols;
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index b6fc115..b9565d8 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -33,6 +33,8 @@
,{field: 'row1', align: 'center',title: '鎺�'}
,{field: 'bay1', align: 'center',title: '鍒�'}
,{field: 'lev1', align: 'center',title: '灞�'}
+ ,{field: 'group1', align: 'center',title: '缁�'}
+ ,{field: 'locAttribute', 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+"'";
if(row.fullPlt === 'Y'){html += " checked ";}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 990f1a2..b9b110c 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -29,11 +29,6 @@
<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="batch" placeholder="鍚堝悓鍙�" autocomplete="off">
- </div>
- </div>
<!-- <div class="layui-inline">-->
<!-- <div class="layui-input-inline">-->
<!-- <input class="layui-input" type="text" name="row" placeholder="鎺掓暟" autocomplete="off">-->
@@ -47,9 +42,13 @@
</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="anfme" placeholder="鏁伴噺" autocomplete="off">
</div>
-
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
+ </div>
</div>
<!-- 寰呮坊鍔� -->
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index a312e9c..0bcb48f 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -19,6 +19,11 @@
<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="model" 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">鎼滅储
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index ba7e944..1496feb 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -250,19 +250,6 @@
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曠鍑�閲�</label>
- <div class="layui-input-block">
- <input name="weight" placeholder="璇疯緭鍏ュ崟绠卞噣閲嶆牸" class="layui-input">
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曠浣撶Н</label>
- <div class="layui-input-block">
- <input name="volume" placeholder="璇疯緭鍏ュ崟绠变綋绉�" class="layui-input">
- </div>
- </div>
<div class="layui-form-item">
<label class="layui-form-label">鍥惧彿</label>
@@ -296,18 +283,12 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曠姣涢噸</label>
+ <label class="layui-form-label">鐗规畩鐗╂枡</label>
<div class="layui-input-block">
- <input name="length" placeholder="璇疯緭鍏ュ崟绠辨瘺閲�" class="layui-input">
+ <input name="be_batch" placeholder="璇疯緭鍏ョ壒娈婄墿鏂�2" class="layui-input">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曠浣撶Н</label>
- <div class="layui-input-block">
- <input name="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">
- </div>
- </div>
</div>
</div>
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 314d2d4..a6b3916 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -46,56 +46,41 @@
<legend>鎼滅储鏍�</legend>
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
-<!-- <div class="layui-input-inline" style="margin-top: -10px">-->
-<!-- <select id="crnNo" name="crnNo">-->
-<!-- <option value="" style="display: none">璇烽�夋嫨宸烽亾</option>-->
-<!-- <option value="1">1鍙�</option>-->
-<!-- <option value="2">2鍙�</option>-->
-<!-- <option value="3">3鍙�</option>-->
-<!-- <option value="4">4鍙�</option>-->
-<!-- </select>-->
-<!-- </div>-->
- <div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="crnNo" class="layui-input" name="crnNo" 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 class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
</div>
</div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
+ </div>
</div>
- </div>
- <!-- 鏃ユ湡鑼冨洿 -->
- <div class="layui-inline" style="width: 300px">
- <div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="model" placeholder="鍥惧彿" autocomplete="off">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="鍚堝悓鍙�" autocomplete="off">
+ <!-- 鏃ユ湡鑼冨洿 -->
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
</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>
-<!-- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>-->
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
</div>
</div>
</fieldset>
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 6f46989..4988cf4 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -47,17 +47,6 @@
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="crnNo" class="layui-input" name="crnNo" 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">
<input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
</div>
@@ -69,12 +58,17 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
</div>
</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="specs" 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">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index 19a0e46..472e4d0 100644
--- a/src/main/webapp/views/report/viewWorkIn.html
+++ b/src/main/webapp/views/report/viewWorkIn.html
@@ -54,6 +54,11 @@
<input class="layui-input" type="text" name="model" placeholder="鍥惧彿" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="anfme" 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>
diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html
index ace1fba..96ffc58 100644
--- a/src/main/webapp/views/report/viewWorkOut.html
+++ b/src/main/webapp/views/report/viewWorkOut.html
@@ -54,6 +54,9 @@
<input class="layui-input" type="text" name="model" placeholder="鍥惧彿" autocomplete="off">
</div>
</div>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="anfme" placeholder="鏁伴噺" autocomplete="off">
+ </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>
diff --git a/src/main/webapp/views/stoMan/stoQue.html b/src/main/webapp/views/stoMan/stoQue.html
index aa87942..86510b4 100644
--- a/src/main/webapp/views/stoMan/stoQue.html
+++ b/src/main/webapp/views/stoMan/stoQue.html
@@ -53,6 +53,16 @@
<input class="layui-input" type="text" name="barcode" placeholder="鎵樼洏鐮�" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="group1" placeholder="缁�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="loc_attribute" placeholder="娣辨祬搴撲綅" autocomplete="off">
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
diff --git a/src/main/webapp/views/waitPakin/waitPakin.html b/src/main/webapp/views/waitPakin/waitPakin.html
index 5e85c45..fd31e89 100644
--- a/src/main/webapp/views/waitPakin/waitPakin.html
+++ b/src/main/webapp/views/waitPakin/waitPakin.html
@@ -16,12 +16,12 @@
<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="zpallet" placeholder="鎵樼洏鏉＄爜" autocomplete="off">
+ <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
</div>
</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="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -29,6 +29,22 @@
<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="condition" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
+ </div>
+
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="anfme" placeholder="鏁伴噺" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
index d7f9945..8b15f34 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
@@ -19,14 +19,40 @@
<input class="layui-input" type="text" name="wrk_no" placeholder="宸ヤ綔鍙�" autocomplete="off">
</div>
</div>
- <div class="layui-inline" style="width: 300px">
+ <div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
</div>
</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="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>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
+ </div>
+
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="anfme" placeholder="鏁伴噺" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="specs" 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="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
<!-- 寰呮坊鍔� -->
--
Gitblit v1.9.1