From a1f8d741e8085c2608ea9906300e60e7fbe23056 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 24 五月 2024 09:39:36 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/agvLocDetl/locDetl.js | 2
src/main/webapp/views/agvWaitPakin/waitPakin.html | 2
src/main/webapp/static/js/agvPakStore/stockAdjust.js | 2
src/main/webapp/views/agvWaitPakinLog/waitPakinLog.html | 2
src/main/webapp/views/picking/picking.html | 2
src/main/java/com/zy/common/web/WcsController.java | 6 +-
src/main/webapp/static/js/saasPakStore/stockAdjust.js | 2
src/main/webapp/views/wrkDetlLog/wrkDetlLog.html | 2
src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js | 2
src/main/webapp/static/js/allLocDetl/locDetl.js | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 18 ++++----
src/main/webapp/views/agvWrkMast/wrkMast.html | 2
src/main/webapp/static/js/common.js | 2
src/main/webapp/static/js/manLocDetl/manLocDetlTemp.js | 2
src/main/webapp/static/js/picking/picking.js | 2
src/main/webapp/static/js/agvWaitPakin/waitPakin.js | 2
src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js | 2
src/main/webapp/static/js/pakStore/stockAdjust.js | 2
src/main/webapp/views/agvWrkDetlLog/wrkDetlLog.html | 2
src/main/java/com/zy/asrs/entity/ManPakOut.java | 2
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 14 +++---
src/main/webapp/views/agvLocDetl/locDetl.html | 2
src/main/java/com/zy/common/model/LocDto.java | 2
src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java | 2
src/main/webapp/static/js/agvWrkDetl/wrkDetl.js | 2
src/main/webapp/static/js/locDetl/locDetl.js | 2
src/main/webapp/views/waitPakinLog/waitPakinLog.html | 2
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 2
src/main/webapp/views/agvBasDevpVisualized/basDevp.html | 4 +-
src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java | 2
src/main/java/com/zy/asrs/entity/param/ModifyPakoutParam.java | 2
src/main/webapp/static/js/agvWaitPakinLog/waitPakinLog.js | 2
32 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ManPakOut.java b/src/main/java/com/zy/asrs/entity/ManPakOut.java
index 8a999c0..01b3970 100644
--- a/src/main/java/com/zy/asrs/entity/ManPakOut.java
+++ b/src/main/java/com/zy/asrs/entity/ManPakOut.java
@@ -206,7 +206,7 @@
@TableField("uuid")
private String uuid;
- //鏂欑鐮�
+ //璐ф灦鐮�
private String containerCode;
//閿�鍞鍗曞彿
private String csocode;
diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
index f350c7d..64e50e3 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -39,7 +39,7 @@
//閿�鍞鍗曡鍙�
private String deadTime;
- //鏂欑鐮�
+ //璐ф灦鐮�
private String suppCode;
public LocDetlAdjust(String matnr, String batch, Double count, String orderNo,String threeCode, String deadTime, String suppCode) {
diff --git a/src/main/java/com/zy/asrs/entity/param/ModifyPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/ModifyPakoutParam.java
index 802c6ef..5ad6c5d 100644
--- a/src/main/java/com/zy/asrs/entity/param/ModifyPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/ModifyPakoutParam.java
@@ -8,7 +8,7 @@
public class ModifyPakoutParam {
//璐ф灦鐮�
String barcode;
- //鏂欑鍙栧嚭鐨勬暟閲�
+ //璐ф灦鍙栧嚭鐨勬暟閲�
List<CA> params;
@Data
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index c25cec4..a0623aa 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -75,19 +75,19 @@
// throw new CoolException(param.getBarcode() + "鏂欐兂鐮佸凡瀛樺湪AGV鍏ュ簱閫氱煡妗ｄ腑");
// }
- //妫�鏌ュ簱瀛樻槸鍚︽湁鐩稿悓鏂欑锛屽瓨鍦ㄥ垯鎶涘嚭寮傚父
+ //妫�鏌ュ簱瀛樻槸鍚︽湁鐩稿悓璐ф灦锛屽瓨鍦ㄥ垯鎶涘嚭寮傚父
if(!Cools.isEmpty(agvLocDetlService.selectOne(new EntityWrapper<AgvLocDetl>().eq("supp_code",param.getBarcode())))){
- throw new CoolException(param.getBarcode() + "鏂欑鐮佸凡瀛樺湪AGV搴撳瓨鏄庣粏涓�");
+ throw new CoolException(param.getBarcode() + "璐ф灦鐮佸凡瀛樺湪AGV搴撳瓨鏄庣粏涓�");
}
- //妫�鏌ュ簱瀛樻槸鍚︽湁鐩稿悓鏂欑锛屽瓨鍦ㄥ垯鎶涘嚭寮傚父
+ //妫�鏌ュ簱瀛樻槸鍚︽湁鐩稿悓璐ф灦锛屽瓨鍦ㄥ垯鎶涘嚭寮傚父
if(!Cools.isEmpty(agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode",param.getBarcode())))){
- throw new CoolException(param.getBarcode() + "鏂欑鐮佸凡瀛樺湪AGV搴撳瓨涓绘。涓�");
+ throw new CoolException(param.getBarcode() + "璐ф灦鐮佸凡瀛樺湪AGV搴撳瓨涓绘。涓�");
}
- //鏌ョ湅宸ヤ綔妗ｆ槸鍚︽湁鐩稿悓鏂欑锛屽瓨鍦ㄥ垯鎶涘嚭寮傚父
+ //鏌ョ湅宸ヤ綔妗ｆ槸鍚︽湁鐩稿悓璐ф灦锛屽瓨鍦ㄥ垯鎶涘嚭寮傚父
if(!Cools.isEmpty(agvWrkMastService.selectByContainerCode(param.getBarcode()))){
- throw new CoolException(param.getBarcode() + "鏂欑鐮佸凡瀛樺湪AGV宸ヤ綔妗ｄ腑");
+ throw new CoolException(param.getBarcode() + "璐ф灦鐮佸凡瀛樺湪AGV宸ヤ綔妗ｄ腑");
}
if (Cools.isEmpty(param.getOrderNo())) {
@@ -317,7 +317,7 @@
}
if(Cools.isEmpty(agvWaitPakinService.selectByContainerCode(barcode))){
- throw new CoolException("璇ユ枡绠辨湭缁勬墭锛屾棤娉曠粦瀹氱珯鐐�");
+ throw new CoolException("璇ヨ揣鏋舵湭缁勬墭锛屾棤娉曠粦瀹氱珯鐐�");
}
AgvBasDevp agvBasDevp1 = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("barcode", barcode));
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 85704ba..eb7bdaa 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -92,9 +92,9 @@
throw new CoolException(param.getBarcode() + "鏁版嵁宸茬粡鍦ㄥ簱");
}
- //鍒ゆ柇鏄惁瀛樺湪鏂欑鐮� => 瀛樺湪鏂欑鐮佸垯瑕佹眰鎻愪氦涓婃潵鐨勭墿鏂檒ist蹇呴』鍏ㄩ儴閮芥湁鏂欑鐮�
+ //鍒ゆ柇鏄惁瀛樺湪璐ф灦鐮� => 瀛樺湪璐ф灦鐮佸垯瑕佹眰鎻愪氦涓婃潵鐨勭墿鏂檒ist蹇呴』鍏ㄩ儴閮芥湁璐ф灦鐮�
boolean hasContainerCode = false;
- int containerCodeCount = 0;//鏂欑鐮佹暟閲�
+ int containerCodeCount = 0;//璐ф灦鐮佹暟閲�
for (CombParam.CombMat combMat : param.getCombMats()) {
if (combMat.getContainerCode() != null) {
hasContainerCode = true;
@@ -103,23 +103,23 @@
}
}
- //鍒ゆ柇鏂欑鏄惁宸茬粡鍑虹幇鍦ㄥ叆搴撻�氱煡妗ｃ�佸簱瀛樹腑
+ //鍒ゆ柇璐ф灦鏄惁宸茬粡鍑虹幇鍦ㄥ叆搴撻�氱煡妗ｃ�佸簱瀛樹腑
if (hasContainerCode) {
if (containerCodeCount != param.getCombMats().size()) {
- throw new CoolException(param.getBarcode() + "璐ф灦鏈�" + (param.getCombMats().size()-containerCodeCount) + "涓湭鎵弿鐨勬枡绠�");
+ throw new CoolException(param.getBarcode() + "璐ф灦鏈�" + (param.getCombMats().size()-containerCodeCount) + "涓湭鎵弿鐨勮揣鏋�");
}
for (CombParam.CombMat combMat : param.getCombMats()) {
- //鍒ゆ柇鏂欑鏄惁姝ｅ湪鍏ュ簱
+ //鍒ゆ柇璐ф灦鏄惁姝ｅ湪鍏ュ簱
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("supp_code", combMat.getContainerCode()).eq("io_status", "N")) > 0) {
- throw new CoolException(combMat.getContainerCode() + "鏂欑姝ｅ湪杩涜鍏ュ簱");
+ throw new CoolException(combMat.getContainerCode() + "璐ф灦姝ｅ湪杩涜鍏ュ簱");
}
- //鍒ゆ柇鏂欑鏄惁宸茬粡鍦ㄥ簱
+ //鍒ゆ柇璐ф灦鏄惁宸茬粡鍦ㄥ簱
if (locDetlService.selectCount(new EntityWrapper<LocDetl>()
.eq("supp_code", combMat.getContainerCode())) > 0) {
- throw new CoolException(combMat.getContainerCode() + "鏂欑宸茬粡鍦ㄥ簱");
+ throw new CoolException(combMat.getContainerCode() + "璐ф灦宸茬粡鍦ㄥ簱");
}
}
}
@@ -604,7 +604,7 @@
BeanUtils.copyProperties(locDetl,wrkDetl);
wrkDetl.setWrkNo(wrkDetls.get(0).getWrkNo());
if(wrkDetl.getAnfme() < param.getAnfme()){
- throw new CoolException("鏂欑"+param.getContainerCode()+"鐨勭墿鏂欐暟閲忓皬浜庢嫞鏂欐暟閲忥紝璇烽噸鏂版牳瀵�");
+ throw new CoolException("璐ф灦"+param.getContainerCode()+"鐨勭墿鏂欐暟閲忓皬浜庢嫞鏂欐暟閲忥紝璇烽噸鏂版牳瀵�");
}
wrkDetl.setAnfme(param.getAnfme());
wrkDetl.setModiTime(new Date());
diff --git a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
index 6ebc10a..4bb6358 100644
--- a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
@@ -67,7 +67,7 @@
if(anfmeSum > mat.getStoreMin()){
continue;
}
- //鏌ヨ褰撳墠鐗╂枡鍥涢」搴撴槸鍚﹀瓨鍦�,骞朵笖璐ф灦涓嶅惈鏈夐潪鏂欑鐗╂枡
+ //鏌ヨ褰撳墠鐗╂枡鍥涢」搴撴槸鍚﹀瓨鍦�,骞朵笖璐ф灦涓嶅惈鏈夐潪璐ф灦鐗╂枡
if(Cools.isEmpty(locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("matnr", mat.getMatnr())))){
continue;
}
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java
index c946ef9..646d5a2 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java
@@ -165,7 +165,7 @@
if(locMast.getLocType1() == 3){
return false;
}else {
- //涓旀娴嬭搴撲綅鏄惁鍚病鏈夋枡绠辩爜鐨勭墿鏂欙紝濡傛湁鏈夊垯涓嶅厑璁稿嚭搴�
+ //涓旀娴嬭搴撲綅鏄惁鍚病鏈夎揣鏋剁爜鐨勭墿鏂欙紝濡傛湁鏈夊垯涓嶅厑璁稿嚭搴�
// LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locNo)
// .andNew().eq("supp_code", "").or().isNull("supp_code"));
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 785eb50..8b01d79 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -41,7 +41,7 @@
//閿�鍞鍗曡鍙�
private String isoseq;
- //鏂欑鐮�
+ //璐ф灦鐮�
private String containerCode;
public LocDto() {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 90f1bb9..fb0ed88 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -578,7 +578,7 @@
String containerCode = param.getContainerCode();
if(Cools.isEmpty(containerCode)){
- throw new CoolException("鏂欑鐮佷负绌�");
+ throw new CoolException("璐ф灦鐮佷负绌�");
}
if(!Character.isDigit(containerCode.charAt(0))){
@@ -618,7 +618,7 @@
return R.ok();
}
- return R.error("娌℃湁鏌ヨ鍒拌鏂欑淇℃伅");
+ return R.error("娌℃湁鏌ヨ鍒拌璐ф灦淇℃伅");
}
@@ -633,7 +633,7 @@
String containerCode = param.getContainerCode().split(";")[0];
if(Cools.isEmpty(containerCode)){
- throw new CoolException("鏂欑鐮佷负绌�");
+ throw new CoolException("璐ф灦鐮佷负绌�");
}
if(!Character.isDigit(containerCode.charAt(0))){
diff --git a/src/main/webapp/static/js/agvLocDetl/locDetl.js b/src/main/webapp/static/js/agvLocDetl/locDetl.js
index 09a7de7..81bb933 100644
--- a/src/main/webapp/static/js/agvLocDetl/locDetl.js
+++ b/src/main/webapp/static/js/agvLocDetl/locDetl.js
@@ -9,7 +9,7 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�'}
+ ,{field: 'suppCode', align: 'center',title: '璐ф灦鐮�'}
,{field: 'threeCode', align: 'center',title: '閿�鍞鍗曞彿'}
,{field: 'deadTime', align: 'center',title: '閿�鍞鍗曡鍙�'}
,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: false}
diff --git a/src/main/webapp/static/js/agvPakStore/stockAdjust.js b/src/main/webapp/static/js/agvPakStore/stockAdjust.js
index 3a1a916..7a600ce 100644
--- a/src/main/webapp/static/js/agvPakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/agvPakStore/stockAdjust.js
@@ -10,7 +10,7 @@
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', edit: true, style: 'font-weight:bold'}
,{field: 'threeCode', align: 'center',title: '閿�鍞鍗曞彿', edit: true, style: 'font-weight:bold'}
,{field: 'deadTime', align: 'center',title: '閿�鍞鍗曡鍙�', edit: true, style: 'font-weight:bold'}
- ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', edit: true, style: 'font-weight:bold'}
+ ,{field: 'suppCode', align: 'center',title: '璐ф灦鐮�', edit: true, style: 'font-weight:bold'}
];
arrRemove(detlCols, "field", "zpallet");
arrRemove(detlCols, "field", "anfme");
diff --git a/src/main/webapp/static/js/agvWaitPakin/waitPakin.js b/src/main/webapp/static/js/agvWaitPakin/waitPakin.js
index 76c37af..f38ef9e 100644
--- a/src/main/webapp/static/js/agvWaitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/agvWaitPakin/waitPakin.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [ {type: 'checkbox'} ];
cols.push(
- //{field: 'suppCode', align: 'center',title: '鏂欑鐮�'},
+ //{field: 'suppCode', align: 'center',title: '璐ф灦鐮�'},
{field: 'anfme', align: 'center',title: '鏁伴噺'});
arrRemove(detlCols, 'field', 'zpallet');
cols.push.apply(cols, detlCols);
diff --git a/src/main/webapp/static/js/agvWaitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/agvWaitPakinLog/waitPakinLog.js
index 64c12e8..7f54835 100644
--- a/src/main/webapp/static/js/agvWaitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/agvWaitPakinLog/waitPakinLog.js
@@ -3,7 +3,7 @@
var cols = [
];
cols.push(
- //{field: 'suppCode', align: 'center',title: '鏂欑鐮�'},
+ //{field: 'suppCode', align: 'center',title: '璐ф灦鐮�'},
{field: 'anfme', align: 'center',title: '鏁伴噺'});
arrRemove(detlCols, 'field', 'zpallet');
cols.push.apply(cols, detlCols);
diff --git a/src/main/webapp/static/js/agvWrkDetl/wrkDetl.js b/src/main/webapp/static/js/agvWrkDetl/wrkDetl.js
index 5b91290..f092f91 100644
--- a/src/main/webapp/static/js/agvWrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/agvWrkDetl/wrkDetl.js
@@ -5,7 +5,7 @@
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width: 160}
];
cols.push(
- //{field: 'suppCode', align: 'center',title: '鏂欑鐮�'},
+ //{field: 'suppCode', align: 'center',title: '璐ф灦鐮�'},
{field: 'anfme', align: 'center',title: '鏁伴噺'});
arrRemove(detlCols, 'field', 'zpallet');
cols.push.apply(cols, detlCols);
diff --git a/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js b/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js
index b1d105d..8ee63da 100644
--- a/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js
+++ b/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js
@@ -5,7 +5,7 @@
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
];
cols.push(
- //{field: 'suppCode', align: 'center',title: '鏂欑鐮�'},
+ //{field: 'suppCode', align: 'center',title: '璐ф灦鐮�'},
{field: 'anfme', align: 'center',title: '鏁伴噺'});
arrRemove(detlCols, 'field', 'zpallet');
cols.push.apply(cols, detlCols);
diff --git a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
index 366c810..bd36976 100644
--- a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
@@ -29,7 +29,7 @@
,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
- ,{field: 'barcode', align: 'center',title: '鏂欑鐮�'}
+ ,{field: 'barcode', align: 'center',title: '璐ф灦鐮�'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}
]],
request: {
diff --git a/src/main/webapp/static/js/allLocDetl/locDetl.js b/src/main/webapp/static/js/allLocDetl/locDetl.js
index a71eba9..10fa2d4 100644
--- a/src/main/webapp/static/js/allLocDetl/locDetl.js
+++ b/src/main/webapp/static/js/allLocDetl/locDetl.js
@@ -3,7 +3,7 @@
function getCol() {
var cols = [
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', sort:true}
+ ,{field: 'suppCode', align: 'center',title: '璐ф灦鐮�', sort:true}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 6ed08d9..2511c20 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -227,7 +227,7 @@
,{field: 'zpallet', align: 'center',title: '璐ф灦鏉＄爜', hide: true}
,{field: 'zpallet', align: 'center',title: '璐ф灦鏉＄爜', hide: false}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜',hide: true}
- ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', hide: false}
+ ,{field: 'suppCode', align: 'center',title: '璐ф灦鐮�', hide: false}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true, hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 1e4486e..973eed7 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -3,7 +3,7 @@
function getCol() {
var cols = [
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', sort:true}
+ ,{field: 'suppCode', align: 'center',title: '璐ф灦鐮�', sort:true}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetlTemp.js b/src/main/webapp/static/js/manLocDetl/manLocDetlTemp.js
index 2811255..dd60e1a 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetlTemp.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetlTemp.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
- //,{field: 'containerCode', align: 'center',title: '鏂欑鐮�', sort:true}
+ //,{field: 'containerCode', align: 'center',title: '璐ф灦鐮�', sort:true}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
//,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index d51a7b8..071cd46 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -10,7 +10,7 @@
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', edit: true, style: 'font-weight:bold'}
,{field: 'threeCode', align: 'center',title: '閿�鍞鍗曞彿', edit: true, style: 'font-weight:bold'}
,{field: 'deadTime', align: 'center',title: '閿�鍞鍗曡鍙�', edit: true, style: 'font-weight:bold'}
- ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', edit: false, style: 'font-weight:bold'}
+ ,{field: 'suppCode', align: 'center',title: '璐ф灦鐮�', edit: false, style: 'font-weight:bold'}
];
arrRemove(detlCols, "field", "zpallet");
arrRemove(detlCols, "field", "anfme");
diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js
index a69bbba..e17dc74 100644
--- a/src/main/webapp/static/js/picking/picking.js
+++ b/src/main/webapp/static/js/picking/picking.js
@@ -131,7 +131,7 @@
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'containerCode', align: 'center',title: '鏂欑鐮�'}
+ ,{field: 'containerCode', align: 'center',title: '璐ф灦鐮�'}
,{field: 'csocode', align: 'center',title: '閿�鍞鍗曞彿'}
,{field: 'isoseq', align: 'center',title: '閿�鍞鍗曡鍙�'}
//,{field: 'owner$', align: 'center',title: '璐т富'}
diff --git a/src/main/webapp/static/js/saasPakStore/stockAdjust.js b/src/main/webapp/static/js/saasPakStore/stockAdjust.js
index e7e872b..7bdcf16 100644
--- a/src/main/webapp/static/js/saasPakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/saasPakStore/stockAdjust.js
@@ -10,7 +10,7 @@
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', edit: true, style: 'font-weight:bold'}
,{field: 'threeCode', align: 'center',title: '閿�鍞鍗曞彿', edit: true, style: 'font-weight:bold'}
,{field: 'deadTime', align: 'center',title: '閿�鍞鍗曡鍙�', edit: true, style: 'font-weight:bold'}
- ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', edit: true, style: 'font-weight:bold'}
+ ,{field: 'suppCode', align: 'center',title: '璐ф灦鐮�', edit: true, style: 'font-weight:bold'}
];
arrRemove(detlCols, "field", "zpallet");
arrRemove(detlCols, "field", "anfme");
diff --git a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
index 5404762..8b1adbb 100644
--- a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
+++ b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
@@ -84,7 +84,7 @@
{{#if agvWaitPakin.batch}}
搴忓垪鐮侊細{{agvWaitPakin.batch}} </br>
{{/if}}
- 鏂欑鐮侊細{{agvWaitPakin.suppCode}} </br>
+ 璐ф灦鐮侊細{{agvWaitPakin.suppCode}} </br>
鏁伴噺锛歿{agvWaitPakin.anfme}}
</div>
{{/if}}
@@ -104,7 +104,7 @@
{{#if agvWrkDetl.batch}}
搴忓垪鐮侊細{{agvWrkDetl.batch}} </br>
{{/if}}
- 鏂欑鐮侊細{{agvWrkDetl.suppCode}} </br>
+ 璐ф灦鐮侊細{{agvWrkDetl.suppCode}} </br>
鍙栬揣鏁伴噺锛歿{agvWrkDetl.anfme}} 缁撲綑鏁伴噺锛歿{agvWrkDetl.volume}}
</div>
{{/if}}
diff --git a/src/main/webapp/views/agvLocDetl/locDetl.html b/src/main/webapp/views/agvLocDetl/locDetl.html
index 2d4401d..a6a8892 100644
--- a/src/main/webapp/views/agvLocDetl/locDetl.html
+++ b/src/main/webapp/views/agvLocDetl/locDetl.html
@@ -22,7 +22,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="supp_code" placeholder="鏂欑鐮�" autocomplete="off">
+ <input class="layui-input" type="text" name="supp_code" placeholder="璐ф灦鐮�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/agvWaitPakin/waitPakin.html b/src/main/webapp/views/agvWaitPakin/waitPakin.html
index aa22117..dd988c5 100644
--- a/src/main/webapp/views/agvWaitPakin/waitPakin.html
+++ b/src/main/webapp/views/agvWaitPakin/waitPakin.html
@@ -16,7 +16,7 @@
<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="supp_code" placeholder="鏂欑鐮�" autocomplete="off">
+ <input class="layui-input" type="text" name="supp_code" placeholder="璐ф灦鐮�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/agvWaitPakinLog/waitPakinLog.html b/src/main/webapp/views/agvWaitPakinLog/waitPakinLog.html
index 178bb52..83f2a69 100644
--- a/src/main/webapp/views/agvWaitPakinLog/waitPakinLog.html
+++ b/src/main/webapp/views/agvWaitPakinLog/waitPakinLog.html
@@ -16,7 +16,7 @@
<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="supp_code" placeholder="鏂欑鐮�" autocomplete="off">
+ <input class="layui-input" type="text" name="supp_code" placeholder="璐ф灦鐮�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/agvWrkDetlLog/wrkDetlLog.html b/src/main/webapp/views/agvWrkDetlLog/wrkDetlLog.html
index 6b0d5fd..a1e4f12 100644
--- a/src/main/webapp/views/agvWrkDetlLog/wrkDetlLog.html
+++ b/src/main/webapp/views/agvWrkDetlLog/wrkDetlLog.html
@@ -31,7 +31,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="supp_code" placeholder="鏂欑鐮�" autocomplete="off">
+ <input class="layui-input" type="text" name="supp_code" placeholder="璐ф灦鐮�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/agvWrkMast/wrkMast.html b/src/main/webapp/views/agvWrkMast/wrkMast.html
index 1743c5b..3c0ca46 100644
--- a/src/main/webapp/views/agvWrkMast/wrkMast.html
+++ b/src/main/webapp/views/agvWrkMast/wrkMast.html
@@ -59,7 +59,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="supp_code" placeholder="鏂欑鐮�" autocomplete="off">
+ <input class="layui-input" type="text" name="supp_code" placeholder="璐ф灦鐮�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/picking/picking.html b/src/main/webapp/views/picking/picking.html
index 73450c5..48d064f 100644
--- a/src/main/webapp/views/picking/picking.html
+++ b/src/main/webapp/views/picking/picking.html
@@ -197,7 +197,7 @@
</tr>
<tr style="height: 30px; font-size: 15px;">
<td align="left" scope="col" colspan="1" style="width: 100px;">
- 鏂欑鐮�:
+ 璐ф灦鐮�:
</td>
<td align="left" scope="col" colspan="1">
{{this.containerCode}}
diff --git a/src/main/webapp/views/waitPakinLog/waitPakinLog.html b/src/main/webapp/views/waitPakinLog/waitPakinLog.html
index 1f4def4..82d0a4e 100644
--- a/src/main/webapp/views/waitPakinLog/waitPakinLog.html
+++ b/src/main/webapp/views/waitPakinLog/waitPakinLog.html
@@ -37,7 +37,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="supp_code" placeholder="鏂欑鐮�" autocomplete="off">
+ <input class="layui-input" type="text" name="supp_code" placeholder="璐ф灦鐮�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
index f89623c..9ea7f87 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
@@ -36,7 +36,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="supp_code" placeholder="鏂欑鐮�" autocomplete="off">
+ <input class="layui-input" type="text" name="supp_code" placeholder="璐ф灦鐮�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1