From d7e71e9eaf18c27fc328b06204ba4bec152608b6 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 13 六月 2023 09:11:30 +0800
Subject: [PATCH] 孚能
---
src/main/webapp/views/locDetl/locDetl.html | 4
src/main/webapp/views/testMast/testMast.html | 5
src/main/java/com/zy/asrs/task/handler/FireOutHandler.java | 22 ++---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 35 +++++++-
src/main/webapp/views/mat/mat.html | 8 +-
src/main/webapp/static/js/wrkMast/wrkMast.js | 2
src/main/java/com/zy/common/web/WcsController.java | 98 +++++++++++++++--------
src/main/webapp/static/js/stoMan/stoQue.js | 2
src/main/java/com/zy/asrs/task/FireOutScheduler.java | 5
src/main/java/com/zy/asrs/utils/PostMesDataUtils.java | 3
src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 4
src/main/webapp/static/js/locDetl/locDetl.js | 4
src/main/webapp/static/js/testMast/testMast.js | 2
src/main/webapp/views/stoMan/stoQue.html | 2
src/main/webapp/views/waitPakin/waitPakin.html | 4
src/main/webapp/static/js/common.js | 6
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2
src/main/java/com/zy/common/service/CommonService.java | 9 +
18 files changed, 135 insertions(+), 82 deletions(-)
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 ce3fbbb..1f5b686 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -604,7 +604,7 @@
matNew.setMatnr(param.getPackNo());
matNew.setMaktx(param.getPackName());
matNew.setManuDate(param.getRequestTime());
- matNew.setDeadWarn(480);//8灏忔椂 480鍒嗛挓
+ matNew.setDeadWarn(360);//6灏忔椂 360鍒嗛挓
matNew.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
matNew.setCreateTime(now);
matNew.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
diff --git a/src/main/java/com/zy/asrs/task/FireOutScheduler.java b/src/main/java/com/zy/asrs/task/FireOutScheduler.java
index 3e2c103..e8301f0 100644
--- a/src/main/java/com/zy/asrs/task/FireOutScheduler.java
+++ b/src/main/java/com/zy/asrs/task/FireOutScheduler.java
@@ -20,8 +20,9 @@
*
*/
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute() {
- if (!confirmDeep) return;
+ private void execute()
+ {
+ //if (!confirmDeep) return;
ReturnT<String> result = fireOutHandler.start();
if (!result.isSuccess()) {
diff --git a/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java b/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
index a1e28db..627b4f2 100644
--- a/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
@@ -42,16 +42,11 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("fire_status", 1)
.eq("loc_sts", "F"));
- Integer ioType = 101; //鍏ュ嚭搴撶被鍨�
+ Integer ioType = 11; //绉诲簱
Date now = new Date();
- //浼樺厛绾�99锛屽嚭搴撶珯109锛氭秷闃茬锛�101
+ //浼樺厛绾�99锛岀Щ搴撳埌0102501
for(LocMast locMast : locMasts){
if (Cools.isEmpty(locMast)){
- continue;
- }
- if (locMast.getPackStatus()==2){//2.娴嬭瘯涓�
- continue;
- }else if (locMast.getPackStatus()==3){//3.娴嬭瘯瀹屾垚
continue;
}
// 鐢熸垚宸ヤ綔鍙�
@@ -61,19 +56,20 @@
wrkMast.setWrkNo(workNo);
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
- wrkMast.setIoPri(99D); // 浼樺厛绾э細99
- wrkMast.setCrnNo(locMast.getCrnNo());
- wrkMast.setSourceStaNo(109); // 婧愮珯
- wrkMast.setStaNo(109); // 鐩爣绔�
+ wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
+ wrkMast.setIoPri(99D);
+ wrkMast.setCrnNo(1);
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
+ wrkMast.setLocNo("0102501"); // 鐩爣搴撲綅
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setBarcode(locMast.getBarcode()); // 鎵樼洏鐮�
wrkMast.setLinkMis("N");
- wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setAppeUser(9999L);
wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(9999L);
wrkMast.setModiTime(now);
if (!wrkMastService.insert(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+locMast.getLocNo());
diff --git a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
index f22ae5b..bb752c3 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -82,7 +82,7 @@
targetLocNo=locMastService.queryFreeLocMast(1,(short)4);
}
if (targetLocNo != null){
- workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
+ workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt("9935"));
//4.娴嬭瘯瀹屾垚涓婃姤
CombParam combParam = new CombParam();
combParam.setPackNo(locDetl.getMatnr());
@@ -146,7 +146,7 @@
targetLocNo=locMastService.queryFreeLocMast(1,(short)2);
}
if (targetLocNo != null){
- workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
+ workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)9935);
sign=true;
}else {
log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->娌℃湁绌哄簱浣�!");
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 30cbf19..17691fb 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -334,7 +334,6 @@
sourceLoc.setLocSts("O");
sourceLoc.setModiTime(now);
sourceLoc.setIoTime(now);
- sourceLoc.setFireStatus(0);
sourceLoc.setPackStatus(0);
if (!locMastService.updateById(sourceLoc)) {
// exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
@@ -347,31 +346,55 @@
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
- locMast.setFireStatus(0);
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
boolean sign =false;
if (locMast.getLocType1().equals(sourceLoc.getLocType1())){
locMast.setPackStatus(packStatus);
+
+ //寰呮祴搴撲綅杞祴璇曞簱浣�
}else if (locMast.getLocType1().equals((short)1) && sourceLoc.getLocType1().equals((short)3)){
locMast.setPackStatus(1);
+ TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
+ .eq("loc_no",sourceLoc.getLocNo())
+ .eq("user_id",locMast.getBarcode())
+ .eq("barcode",locDetl.getMatnr())
+ );
+ if(!Cools.isEmpty(testMast)){
+ testMast.setChannel(locMast.getChannel());
+ testMast.setLocNo(wrkMast.getLocNo());
+ testMast.setModiTime(new Date());
+ if (!testMastService.update(testMast,new EntityWrapper<TestMast>()
+ .eq("loc_no",sourceLoc.getLocNo())
+ .eq("user_id",locMast.getBarcode())
+ .eq("barcode",locDetl.getMatnr()))){
+ throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
+ }
+ }else {
+ throw new CoolException("寰呮祴搴撲綅鏃犵墿");
+ }
+
}else {
+ //娴嬭瘯搴撲綅杞潤缃簱浣�
if (locMast.getLocType1().equals((short)4)){
locMast.setPackStatus(4); //4:NG
}else {
locMast.setPackStatus(5); //5:闈欑疆涓�
}
sign=true;
- if (locMast.getLocType1()==1 && sourceLoc.getLocType1()==2){
+ if (locMast.getLocType1()==2 && sourceLoc.getLocType1()==1){
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
.eq("loc_no",sourceLoc.getLocNo())
- .eq("barcode",locMast.getBarcode())
+ .eq("barcode",locDetl.getMatnr())
.eq("status",4)
);
testMast.setStatus(5);
testMast.setModiTime(new Date());
- if (!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("loc_no",sourceLoc.getLocNo()).eq("barcode",locMast.getBarcode()).eq("status",4))){
+ if (!testMastService.update(testMast,new EntityWrapper<TestMast>()
+ .eq("loc_no",sourceLoc.getLocNo())
+ .eq("barcode",locDetl.getMatnr())
+ .eq("status",4))){
throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
}
}
@@ -470,7 +493,6 @@
locMast.setBarcode("");
locMast.setModiTime(now);
locMast.setIoTime(now);
- locMast.setFireStatus(0);
locMast.setPackStatus(0);
if (!locMastService.updateById(locMast)) {
// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
@@ -506,7 +528,6 @@
locMast.setBarcode("");
locMast.setModiTime(now);
locMast.setIoTime(now);
- locMast.setFireStatus(0);
locMast.setPackStatus(0);
if (!locMastService.updateById(locMast)) {
// exceptionHandle("绌烘澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
diff --git a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
index 65ff408..ccf5b5d 100644
--- a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
+++ b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
@@ -60,7 +60,8 @@
response,
success
);
- } catch (Exception e) { log.error("", e); }
+ } catch (Exception e) {
+ log.error("", e); }
}
}
return SUCCESS;
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index c47a215..b187200 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -160,8 +160,13 @@
rowLastnoService.updateById(rowLastno);
if (crnNo==1){
- LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("loc_type2", (short) 3));
- if (!Cools.isEmpty(locMast1)){
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "F")
+ .eq("loc_type1", (short) 3));
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .eq("loc_type1", (short) 1));
+ if (!Cools.isEmpty(locMast1)||Cools.isEmpty(locMast2)){
locMast = locMastService.queryFreeLocMast(2,(short)3);
if (Cools.isEmpty(locMast)){
locMast = locMastService.queryFreeLocMast(1,(short)3);
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 41456b6..683c4b3 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -79,6 +79,15 @@
.eq("user_id",param.getBarcode())//鏌ユ墭鐩樼爜
.eq("status",4)); //瀹屾垚娴嬭瘯
logs=false;
+ }else{
+ LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("matnr",param.getPackNo())
+ .or()
+ .eq("zpallet",param.getBarcode()));
+ if(!Cools.isEmpty(locDetl)){
+ return R.error("PACK鐮佸湪搴擄紒锛侊紒锛�");
+ }
+
}
Date now = new Date();
if (true){
@@ -206,7 +215,7 @@
LocMast locMast = locMastService.selectById(dto.getLocNo());
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
- waitPakins.forEach(waitPakin -> {
+ for (WaitPakin waitPakin: waitPakins) {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(waitPakin);
wrkDetl.setWrkNo(wrkMast.getWrkNo());
@@ -217,31 +226,50 @@
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
- TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
- .eq("barcode", wrkDetl.getMatnr()));//pack鐮�
- if (Cools.isEmpty(testMast)){
- //鐢熸垚娴嬭瘯妗�
- testMast=new TestMast();
- testMast.setChannel(locMast.getChannel());
- testMast.setUserId(wrkMast.getBarcode());//鎵樼洏鐮�
- testMast.setStatus(1);
- testMast.setBarcode(wrkDetl.getMatnr());
- testMast.setLocNo(locMast.getLocNo());
- testMast.setModiTime(now);
- testMast.setAppeTime(now);
- if (!testMastService.insert(testMast)){
- throw new CoolException(wrkDetl.getMatnr()+"鐢熸垚娴嬭瘯妗ｅけ璐�");
+
+ TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
+ .eq("barcode", wrkDetl.getMatnr()));//pack鐮�
+ if (Cools.isEmpty(testMast)){
+ //鐢熸垚娴嬭瘯妗�
+ testMast=new TestMast();
+ //鍏ュ緟娴嬪簱浣嶉�氶亾璁句负0
+ if(locMast.getChannel()==null) {
+ testMast.setChannel(0);//閫氶亾璁句负0
+ }else{
+ testMast.setChannel(locMast.getChannel());
+ }
+ testMast.setUserId(wrkMast.getBarcode());//鎵樼洏鐮�
+ testMast.setStatus(1);
+ testMast.setBarcode(wrkDetl.getMatnr());
+ testMast.setLocNo(locMast.getLocNo());
+ testMast.setModiTime(now);
+ testMast.setAppeTime(now);
+ if (!testMastService.insert(testMast)){
+ throw new CoolException(wrkDetl.getMatnr()+"鐢熸垚娴嬭瘯妗ｅけ璐�");
+ }
+ }else if(wrkMast.getStaNo()==209){
+ testMast.setBarcode(wrkDetl.getMatnr());
+ testMast.setChannel(locMast.getChannel());
+ testMast.setLocNo(locMast.getLocNo());
+ testMast.setUserId(wrkMast.getBarcode());//鎵樼洏鐮�
+ testMast.setAppeTime(now);
+ if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode", wrkDetl.getMatnr()))){
+ throw new CoolException(wrkDetl.getMatnr()+"鏇存柊娴嬭瘯妗ｅけ璐�");
+ }
+ }else {
+ testMast.setBarcode(wrkDetl.getMatnr());
+ testMast.setChannel(locMast.getChannel());
+ testMast.setLocNo(locMast.getLocNo());
+ testMast.setStatus(1);
+ testMast.setUserId(wrkMast.getBarcode());//鎵樼洏鐮�
+ testMast.setAppeTime(now);
+ if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode", wrkDetl.getMatnr()))){
+ throw new CoolException(wrkDetl.getMatnr()+"鏇存柊娴嬭瘯妗ｅけ璐�");
+ }
}
- }else {
- testMast.setBarcode(wrkDetl.getMatnr());
- testMast.setChannel(locMast.getChannel());
- testMast.setLocNo(locMast.getLocNo());
- testMast.setAppeTime(now);
- if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode", wrkDetl.getMatnr()))){
- throw new CoolException(wrkDetl.getMatnr()+"鏇存柊娴嬭瘯妗ｅけ璐�");
- }
- }
- });
+
+
+ }
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
.eq("zpallet", barcode);
@@ -265,16 +293,16 @@
if (!locMastService.updateById(locMast)){
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}else{
- if (locMast.getRow1()<3){
- //1.鎵爜涓婃姤
- CombParam combParam = new CombParam();
- combParam.setPackNo(wrkMast.getBarcode());
- combParam.setLocNo(wrkMast.getLocNo());
- combParam.setPackSts(0);
- combParam.setStepSts(1);
- combParam.setRequestTime(DateUtils.convert(now));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
- }
+// if (locMast.getRow1()<3){
+// //1.鎵爜涓婃姤
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(wrkMast.getBarcode());
+// combParam.setLocNo(wrkMast.getLocNo());
+// combParam.setPackSts(0);
+// combParam.setStepSts(1);
+// combParam.setRequestTime(DateUtils.convert(now));
+// new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+// }
}
} else {
throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 4caf0c1..322b9e9 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -181,7 +181,7 @@
}
var matCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 180}
+ {field: 'matnr', align: 'center',title: 'PACK鐮�', width: 180}
// {field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
// ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
@@ -222,12 +222,12 @@
]
var detlCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ {field: 'matnr', align: 'center',title: 'PACK鐮�', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'zpallet', align: 'center',title: 'PACK鐮�'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'}
,{field: 'specs', align: 'center',title: '閰嶇疆', hide: false}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 721bed5..c80059f 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -2,12 +2,12 @@
function getCol() {
var cols = [
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ {field: 'matnr', align: 'center',title: 'PACK鐮�', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'zpallet', align: 'center',title: 'pack鐮�'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'}
,{field: 'specs', align: 'center',title: '閰嶇疆'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index be54683..3d87289 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -44,7 +44,7 @@
// html += "disabled='disabled' >";
// return html;
// },width:80}
- ,{field: 'barcode', align: 'center',title: 'PACK鐮�'}
+ ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
diff --git a/src/main/webapp/static/js/testMast/testMast.js b/src/main/webapp/static/js/testMast/testMast.js
index 3a2a1c3..d7cf174 100644
--- a/src/main/webapp/static/js/testMast/testMast.js
+++ b/src/main/webapp/static/js/testMast/testMast.js
@@ -26,7 +26,7 @@
,{field: 'channel', align: 'center',title: '閫氶亾'}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
,{field: 'barcode', align: 'center',title: 'PACK鐮�'}
- ,{field: 'userId', align: 'center',title: '鐢ㄦ埛鐮�'}
+ ,{field: 'userId', align: 'center',title: '鎵樼洏鐮�'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 2931ae0..409d2f6 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -30,7 +30,7 @@
,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'barcode', align: 'center',title: 'pack鐮�'}
+ ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
// ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 0b8cc8b..9ae7967 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -21,12 +21,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="zpallet" placeholder="PACK鐮�" 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">
+ <input class="layui-input" type="text" name="matnr" placeholder="Pack鐮�" autocomplete="off">
</div>
</div>
<!-- <div class="layui-inline">-->
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 7966f6d..4435a7d 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -86,9 +86,9 @@
<!-- 琛ㄦ牸宸ュ叿鏍�2 -->
<div id="search-box" class="layui-form toolbar" style="padding-top: 5px">
<div class="layui-inline">
- <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧缂栧彿:</label>
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">PACK鐮�:</label>
<div class="layui-input-inline">
- <input name="matnr" class="layui-input" placeholder="杈撳叆鍟嗗搧缂栧彿"/>
+ <input name="matnr" class="layui-input" placeholder="璇疯緭鍏ACK鐮�"/>
</div>
</div>
<div class="layui-inline">
@@ -217,9 +217,9 @@
<div class="layui-col-md6">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍟嗗搧缂栧彿</label>
+ <label class="layui-form-label layui-form-required">PACK鐮�</label>
<div class="layui-input-block">
- <input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ <input id="matnr" name="matnr" placeholder="PACK鐮�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
diff --git a/src/main/webapp/views/stoMan/stoQue.html b/src/main/webapp/views/stoMan/stoQue.html
index 20e03bd..0e92375 100644
--- a/src/main/webapp/views/stoMan/stoQue.html
+++ b/src/main/webapp/views/stoMan/stoQue.html
@@ -50,7 +50,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="barcode" placeholder="pack鐮�" autocomplete="off">
+ <input class="layui-input" type="text" name="barcode" placeholder="鎵樼洏鐮�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/testMast/testMast.html b/src/main/webapp/views/testMast/testMast.html
index 92c9977..1487f4b 100644
--- a/src/main/webapp/views/testMast/testMast.html
+++ b/src/main/webapp/views/testMast/testMast.html
@@ -82,9 +82,9 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鐢ㄦ埛鐮�: </label>
+ <label class="layui-form-label">鎵樼洏鐮�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="userId" placeholder="鐢ㄦ埛鐮�">
+ <input class="layui-input" name="userId" placeholder="鎵樼洏鐮�">
</div>
</div>
<div class="layui-form-item">
@@ -97,6 +97,7 @@
<option value="3">娴嬭瘯涓�</option>
<option value="4">瀹屾垚</option>
<option value="5">宸茬Щ搴�</option>
+ <option value="6">鐏</option>
</select>
</div>
</div>
diff --git a/src/main/webapp/views/waitPakin/waitPakin.html b/src/main/webapp/views/waitPakin/waitPakin.html
index e8b1f94..84d7817 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="PACK鐮�" 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">
+ <input class="layui-input" type="text" name="matnr" placeholder="Pack鐮�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
--
Gitblit v1.9.1