From bbb442240f6491f0f9bb3a690b61885378e4b336 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期二, 16 八月 2022 08:40:20 +0800
Subject: [PATCH] #
---
src/main/webapp/views/testMast/testMast.html | 36 ++++----
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 8 ++
src/main/java/com/zy/asrs/controller/OpenController.java | 23 +++++
src/main/java/com/zy/asrs/controller/MobileController.java | 4
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 37 ++++-----
src/main/java/com/zy/asrs/entity/param/Review.java | 3
src/main/java/com/zy/asrs/service/OpenService.java | 5 +
src/main/java/com/zy/asrs/entity/TestMast.java | 6 +
src/main/webapp/static/js/testMast/testMast.js | 30 +++---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 3
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 12 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 60 ++++++++++++++-
src/main/resources/application.yml | 8 +-
13 files changed, 161 insertions(+), 74 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 6588483..0a14b36 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.annotations.AppAuth;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -27,6 +28,7 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.*;
/**
@@ -336,7 +338,7 @@
return R.ok();
}
@PostMapping("/test/suspend/auth")
- @ManagerAuth(memo = "鏆傚仠娴嬭瘯")
+// @ManagerAuth(memo = "鏆傚仠娴嬭瘯")
public synchronized R suspendTestPACK() {
mobileService.suspendTestPACK(); //璇锋眰鏆傚仠娴嬭瘯
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 78ded4b..1ca78f7 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -253,6 +253,25 @@
return R.ok();
}
+ @PostMapping("/rpv/testFinish/auth/v1")
+ @AppAuth(memo = "娴嬭瘯瀹屾垚")
+ public synchronized R testFinish(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) Review param,
+ HttpServletRequest request){
+
+ auth(appkey, param, request);
+ Map<String,Boolean> map=new HashMap<>();
+
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (param.getTestResult().equals("ok")){
+ map.put("isComplete",openService.testFinish(param));
+ }else {
+ map.put("isComplete",false);
+ }
+ return R.ok(map);
+ }
@PostMapping("/rpv/test/open/auth")
@AppAuth(memo = "妯℃嫙娴嬭瘯鎺ュ彛")
public synchronized R test1(@RequestHeader(required = false) String appkey,
@@ -260,9 +279,7 @@
HttpServletRequest request){
auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
+
System.out.println(param);
Map<String,Boolean> map=new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/entity/TestMast.java b/src/main/java/com/zy/asrs/entity/TestMast.java
index b94c373..6f6cfde 100644
--- a/src/main/java/com/zy/asrs/entity/TestMast.java
+++ b/src/main/java/com/zy/asrs/entity/TestMast.java
@@ -53,7 +53,7 @@
/**
* 鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍�;3 4: 瀹屾垚
*/
- @ApiModelProperty(value= "鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍�;3 4: 瀹屾垚 ")
+ @ApiModelProperty(value= "鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍� 3锛氭祴璇曚腑 4: 瀹屾垚 ")
private Integer status;
/**
@@ -103,7 +103,9 @@
case 1:
return "鐢宠涓�";
case 2:
- return "宸插鏍�;3";
+ return "宸插鏍�";
+ case 3:
+ return "娴嬭瘯涓�";
case 4:
return "瀹屾垚";
default:
diff --git a/src/main/java/com/zy/asrs/entity/param/Review.java b/src/main/java/com/zy/asrs/entity/param/Review.java
index 1c82d66..d1e0208 100644
--- a/src/main/java/com/zy/asrs/entity/param/Review.java
+++ b/src/main/java/com/zy/asrs/entity/param/Review.java
@@ -12,6 +12,9 @@
private String barcode;
// 璇锋眰鏃堕棿, yyyy-MM-dd HH:mm:ss
private String requestTime;
+// 娴嬭瘯缁撴灉,OK/NG
+ private String testResult;
+
private Boolean pause;
}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index c76f156..aa5c42c 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -55,4 +55,9 @@
* pda娴嬭瘯澶嶆牳璋冪敤鎺ュ彛
*/
void infoReview(Review review);
+ /**
+ * pda娴嬭瘯瀹屾垚
+ */
+ Boolean testFinish(Review review);
+
}
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 dae07fb..55923d4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -618,11 +618,11 @@
public void startUpTestPACK(TestMast testMast) {
//鍚姩娴嬭瘯璇锋眰
- ReturnT<String> result=startUpTestPACK1(testMast);
- if (!result.isSuccess()) {
- log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
+// ReturnT<String> result=startUpTestPACK1(testMast);
+// if (!result.isSuccess()) {
+// log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
// throw new CoolException("娴嬭瘯鐢宠澶辫触");
- }
+// }
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()));
if (Cools.isEmpty(locMast)) {
throw new CoolException(BaseRes.PARAM);
@@ -635,7 +635,7 @@
if (!testMastService.insert(testMast)){
throw new CoolException("娣诲姞testMast澶辫触");
}
- locMast.setPackStatus(2);
+ locMast.setPackStatus(1);
locMast.setModiTime(now);
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
throw new CoolException("鐢宠娴嬭瘯澶辫触");
@@ -646,7 +646,7 @@
public void suspendTestPACK() {
ReturnT<String> result=suspendTestPACK1();
if (!result.isSuccess()) {
- log.error("娴嬭瘯鐢宠澶辫触");
+ log.error("鏆傚仠娴嬭瘯澶辫触");
}
}
@Transactional
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 76ede1d..6974692 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -15,6 +15,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.enums.WorkNoType;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +62,8 @@
private TestMastService testMastService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private WorkService workService;
@Override
@Transactional
@@ -609,18 +612,24 @@
@Transactional
public void infoReview(Review review) {
Wrapper wrapper = new EntityWrapper<TestMast>()
- .eq("loc_no", review.getLocNo());
+ .eq("loc_no", review.getLocNo())
+ .eq("barcode", review.getBarcode())
+ .eq("user_Id", review.getUserId());
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
- if (locMast.getPackStatus()!=1){
+ if (locMast.getPackStatus()!=1) {
throw new CoolException("浜у搧鐘舵�佷笉鏄� 1:寰呮祴璇�");
}
TestMast testMast = testMastService.selectOne(wrapper);
if(null != testMast){
if (testMast.getStatus()==1){
- testMast.setStatus(2);
+ testMast.setStatus(3);
testMast.setModiTime(new Date());
if (!testMastService.update(testMast,wrapper)){
-
+ throw new CoolException("鏇存柊娴嬭瘯鐘舵�佸け璐�");
+ }
+ locMast.setPackStatus(2);
+ if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
+ throw new CoolException("鏇存柊浜у搧鐘舵�佸け璐�");
}
}else if (Cools.isEmpty(testMast.getStatus())){
throw new CoolException("鐘舵�佸紓甯�");
@@ -631,6 +640,49 @@
throw new CoolException("娴嬭瘯鐢宠澶辫触");
}
}
+
+
+ @Override
+ @Transactional
+ public Boolean testFinish(Review review) {
+ Boolean success=true;
+ Wrapper wrapper = new EntityWrapper<TestMast>()
+ .eq("loc_no", review.getLocNo())
+ .eq("barcode", review.getBarcode())
+ .eq("user_Id", review.getUserId());
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
+ if (locMast.getPackStatus()!=2){
+ throw new CoolException("浜у搧鐘舵�佷笉鏄� 2:娴嬭瘯涓�");
+ }
+ TestMast testMast = testMastService.selectOne(wrapper);
+ if(null != testMast){
+ if (testMast.getStatus()==3){
+ testMast.setStatus(4);
+ testMast.setModiTime(new Date());
+ if (!testMastService.update(testMast,wrapper)){
+ throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
+ }
+ }else if (Cools.isEmpty(testMast.getStatus())){
+ throw new CoolException("鐘舵�佸紓甯�");
+ }else {
+ throw new CoolException("鐘舵�佷笉鏄� 2:娴嬭瘯涓�");
+ }
+ } else {
+ throw new CoolException("鐘舵�佸紓甯�");
+ }
+ LocMast targetLocNo = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1",2)
+ .eq("loc_sts","O")
+ .eq("fire_status", 0)
+ .eq("pack_status",0));
+ if (targetLocNo != null){
+ workService.locMove(review.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(review.getUserId()));
+ }else {
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
+ return success;
+ }
+
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
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 3ebff2a..86a0c27 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -201,7 +201,8 @@
for (OutLocDto dto : dtos) {
// 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
if (ioWorkType == null) {
- ioType = dto.isAll() ? 101 : 103;
+// ioType = dto.isAll() ? 101 : 103;
+ ioType = 101;
} else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {
ioType = 107;
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index a9d19e0..a587613 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -41,6 +41,10 @@
private ApiLogService apiLogService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WaitPakinLogService waitPakinLogService;
@Value("${mes.url}")
private String mesUrl;
@@ -56,14 +60,8 @@
try {
/*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
ReturnT<String> result = null;
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if (wrkMast.getWrkSts() == 5 && wrkMast.getIoType() == 1) {
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
- locMast.setFireStatus(0);
- locMast.setPackStatus(1);
- if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()))){
- throw new CoolException("娑堥槻鐘舵��/浜у搧鐘舵�佹洿鏂板け璐�");
- }
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if(wrkDetl != null){
CombParam combParam = new CombParam();
combParam.setPackNo(wrkDetl.getZpallet());
@@ -71,24 +69,17 @@
combParam.setLocno(wrkMast.getLocNo());
combParam.setPackSts(1);
combParam.setRequestTime(DateUtils.convert(new Date()));
- result = postMesData(inpath,combParam);
+// result = postMesData(inpath,combParam);
}
} else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
- locMast.setFireStatus(0);
- locMast.setPackStatus(0);
- if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()))){
- throw new CoolException("娑堥槻鐘舵��/浜у搧鐘舵�佹洿鏂板け璐�");
- }
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if(wrkDetl != null){
CombParam combParam = new CombParam();
combParam.setPackNo(wrkDetl.getZpallet());
combParam.setPackName(wrkDetl.getMatnr());
combParam.setLocno(wrkMast.getLocNo());
- combParam.setPackSts(null);
+ combParam.setPackSts(0);
combParam.setRequestTime(DateUtils.convert(new Date()));
- result = postMesData(outPath,combParam);
+// result = postMesData(outPath,combParam);
}
}
if(null != result && !result.isSuccess()){
@@ -97,6 +88,14 @@
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
+ // 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
+ if (!waitPakinLogService.save(wrkMast.getBarcode())) {
+ exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ // 鍒犻櫎鍏ュ簱閫氱煡妗�
+ if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
+ exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
@@ -130,9 +129,7 @@
String response = "";
boolean success = false;
try {
- Map<String, Object> map = new HashMap<>();
- map.put("appkey","ea1f0459efc02a79f046f982767939ae");
- response = new HttpHandler.Builder().setHeaders(map)
+ response = new HttpHandler.Builder()
.setUri(mesUrl)
.setPath(mesPath)
.setJson(JSON.toJSONString(combParam))
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 f5fb2df..ebbc917 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -135,6 +135,8 @@
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
+ locMast.setFireStatus(0);
+ locMast.setPackStatus(1);
if (!locMastService.updateById(locMast)) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -280,6 +282,8 @@
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());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -291,6 +295,8 @@
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
+ locMast.setFireStatus(0);
+ locMast.setPackStatus(3); //3:闈欑疆涓�
if (!locMastService.updateById(locMast)) {
// exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -368,6 +374,8 @@
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());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8164306..e76145b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -55,10 +55,10 @@
mes:
url: 127.0.0.1:8080/test
# 鍏ュ簱涓婃姤
- inPath: localhost:8080/ynwms/open/asrs/rpv/test/open/auth
+ inPath: 127.0.0.1:8080/ynwms/open/asrs/rpv/test/open/auth
# 鍑哄簱涓婃姤
- outPath: localhost:8080/ynwms/open/asrs/rpv/test/open/auth
+ outPath: 127.0.0.1:8080/ynwms/open/asrs/rpv/test/open/auth
# 鍚姩娴嬭瘯璇锋眰
- startUpTestPACK: localhost:8080/ynwms/open/asrs/rpv/test/open/auth
+ startUpTestPACK: 127.0.0.1:8080/ynwms/open/asrs/rpv/test/open/auth
#鏆傚仠娴嬭瘯
- suspendTestPACK: localhost:8080/ynwms/open/asrs/rpv/test/open/auth
\ No newline at end of file
+ suspendTestPACK: 127.0.0.1:8080/ynwms/open/asrs/rpv/test/open/auth
\ No newline at end of file
diff --git a/src/main/webapp/static/js/testMast/testMast.js b/src/main/webapp/static/js/testMast/testMast.js
index 01813cf..3a2a1c3 100644
--- a/src/main/webapp/static/js/testMast/testMast.js
+++ b/src/main/webapp/static/js/testMast/testMast.js
@@ -22,14 +22,14 @@
height: 'full-120',
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: '编号'}
- ,{field: 'channel', align: 'center',title: ''}
- ,{field: 'locNo', align: 'center',title: '库位号'}
- ,{field: 'barcode', align: 'center',title: 'PACK码'}
- ,{field: 'userId', align: 'center',title: '用户码'}
- ,{field: 'status$', align: 'center',title: '状态'}
- ,{field: 'modiTime$', align: 'center',title: '修改时间'}
- ,{field: 'appeTime$', align: 'center',title: '添加时间'}
+ ,{field: 'id', align: 'center',title: '缂栫爜'}
+ ,{field: 'channel', align: 'center',title: '閫氶亾'}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'barcode', align: 'center',title: 'PACK鐮�'}
+ ,{field: 'userId', align: 'center',title: '鐢ㄦ埛鐮�'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
@@ -80,7 +80,7 @@
break;
case 'deleteData':
if (checkStatus.length === 0) {
- layer.msg('璇烽?夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
return;
}
del(checkStatus.map(function (d) {
@@ -88,7 +88,7 @@
}));
break;
case 'exportData':
- admin.confirm('纭畾瀵煎嚭Excel鍚?', {shadeClose: true}, function(){
+ admin.confirm('纭畾瀵煎嚭Excel琛ㄥ悧?', {shadeClose: true}, function(){
var titles=[];
var fields=[];
obj.config.cols[0].map(function (col) {
@@ -128,7 +128,7 @@
}
});
- // 鐩戝惉琛屽伐鍏蜂簨浠?
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(testMast)', function(obj){
var data = obj.data;
switch (obj.event) {
@@ -141,12 +141,12 @@
}
});
- /* 寮圭獥 - 鏂板銆佷慨鏀? */
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
function showEditModel(mData) {
admin.open({
type: 1,
area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵??',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
layDateRender(mData);
@@ -181,7 +181,7 @@
/* 鍒犻櫎 */
function del(ids) {
- layer.confirm('纭畾瑕佸垹闄ら?変腑鏁版嵁鍚楋紵', {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鐨勬暟鎹悧锛�', {
skin: 'layui-layer-admin',
shade: .1
}, function (i) {
@@ -220,7 +220,7 @@
tableReload(false);
});
- // 鏃堕棿閫夋嫨鍣?
+ // 鏃堕棿閫夋嫨
function layDateRender(data) {
setTimeout(function () {
layDate.render({
diff --git a/src/main/webapp/views/testMast/testMast.html b/src/main/webapp/views/testMast/testMast.html
index 4c233f5..a651bf8 100644
--- a/src/main/webapp/views/testMast/testMast.html
+++ b/src/main/webapp/views/testMast/testMast.html
@@ -64,51 +64,51 @@
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">: </label>
+ <label class="layui-form-label layui-form-required">閫氶亾锛�</label>
<div class="layui-input-block">
- <input class="layui-input" name="channel" placeholder="请输入" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="channel" placeholder="閫氶亾" lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">库位号: </label>
+ <label class="layui-form-label layui-form-required">搴撲綅鍙凤細</label>
<div class="layui-input-block">
- <input class="layui-input" name="locNo" placeholder="请输入库位号" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="locNo" placeholder="搴撲綅鍙�" lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">PACK码: </label>
+ <label class="layui-form-label">PACK鐮侊細</label>
<div class="layui-input-block">
- <input class="layui-input" name="barcode" placeholder="请输入PACK码">
+ <input class="layui-input" name="barcode" placeholder="PACK鐮�">
</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">
- <label class="layui-form-label">状态: </label>
+ <label class="layui-form-label">鐘舵��: </label>
<div class="layui-input-block">
<select name="status">
- <option value="">请选择状态</option>
- <option value="0">待申请</option>
- <option value="1">申请中</option>
- <option value="2">已复核;3</option>
- <option value="4">完成</option>
+ <option value="0">寰呯敵璇�</option>
+ <option value="1">鐢宠涓�</option>
+ <option value="2">宸插鏍�</option>
+ <option value="3">娴嬭瘯涓�</option>
+ <option value="4">瀹屾垚</option>
</select>
</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="modiTime" id="modiTime$" placeholder="请输入修改时间">
+ <input class="layui-input" name="modiTime" id="modiTime$" placeholder="淇敼鏃堕棿">
</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="appeTime" id="appeTime$" placeholder="请输入添加时间">
+ <input class="layui-input" name="appeTime" id="appeTime$" placeholder="娣诲姞鏃堕棿">
</div>
</div>
--
Gitblit v1.9.1