From 9d2d7c23cea8d50716b4bf1272557001ee7874f5 Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期一, 03 十一月 2025 18:02:58 +0800
Subject: [PATCH] 调试
---
src/main/webapp/static/js/locDetl/locDetl.js | 2 +-
src/main/webapp/views/wrkMast/wrkMast.html | 14 +++++++-------
src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java | 6 +++++-
src/main/java/com/zy/common/config/AdminInterceptor.java | 2 +-
src/main/java/com/zy/asrs/controller/MatController.java | 6 ++++++
src/main/java/com/zy/common/service/CommonService.java | 5 +++--
src/main/resources/license.lic | 0
7 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
index 2eeae2d..005327a 100644
--- a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
+++ b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
@@ -18,6 +18,7 @@
import com.zy.asrs.service.MobileService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,6 +29,7 @@
import java.util.List;
import java.util.Map;
+@Slf4j
@RequestMapping
@RestController
public class BarcodeMatnrController extends BaseController {
@@ -93,6 +95,8 @@
}
for (MatBarcode matBarcode : list) {
if (!matBarcode.getZpallet().equals(list.get(0).getZpallet())){
+ log.info(matBarcode.getZpallet());
+ log.info(list.get(0).getZpallet());
throw new CoolException("璇烽�夋嫨鐩稿悓鎵樼洏鐮佺殑鏁版嵁");
}
}
@@ -145,7 +149,7 @@
@RequestMapping(value = "/barcodeMatnr/add2/auth")
@ManagerAuth
public R clamp(WaitPakin waitPakin) {
- if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
+ if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())){
return R.error(BaseRes.PARAM);
}
Mat mat = matService.selectById(waitPakin.getModiUser());
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 06d4717..b62d89b 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -177,6 +177,12 @@
if (Cools.isEmpty(mat.getUnit())){
return R.error(BaseRes.PARAM);
}
+ if (!mat.getUnit().startsWith("6")&&!mat.getUnit().startsWith("7")&&!mat.getUnit().startsWith("8")){
+ throw new CoolException("鎵樼洏鐮侀浣嶄笉绗﹀悎瑙勮寖");
+ }
+ if (mat.getUnit().length()!= 8){
+ throw new CoolException("鎵樼洏鐮佷笉鏄叓浣嶏紝璇锋鏌�");
+ }
matBarcodeService.addBarcodeMatnrTwo(mat);
return R.ok();
}
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 3932e07..4a2d242 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -116,7 +116,7 @@
// String deToken = Cools.deTokn(token, user.getPassword());
// long timestamp = Long.parseLong(deToken.substring(0, 13));
// 15鍒嗛挓鍚庤繃鏈�
- if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
+ if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 86400000){
Http.response(response, BaseRes.DENIED);
return false;
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 5afb923..02c56b1 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -339,8 +339,9 @@
}
String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "O"));
- if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
+ //LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locMast1.getLocNo()).eq("loc_sts", "O"));
+ if (Cools.isEmpty(locMast2)) {
+ locMast = locMast1;
break;
}
}
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 88c9db4..ec659b5 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index d46cb7c..e54a513 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -17,7 +17,7 @@
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: '绠�鍥�', hide: false}
+ ,{field: 'sku', align: 'center',title: '绠�鍥�', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 67b2ce2..fb57a22 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -122,13 +122,13 @@
<a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a>
<a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
<a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a>
- <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">缁存姢鐘舵��</a>
- {{#if (d.ioType === 103) { }}
- <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鎷�</a>
- {{# } }}
- {{#if (d.ioType === 107) { }}
- <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鐩�</a>
- {{# } }}
+<!-- <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">缁存姢鐘舵��</a>-->
+<!-- {{#if (d.ioType === 103) { }}-->
+<!-- <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鎷�</a>-->
+<!-- {{# } }}-->
+<!-- {{#if (d.ioType === 107) { }}-->
+<!-- <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鐩�</a>-->
+<!-- {{# } }}-->
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
--
Gitblit v1.9.1