From 5ce6bfb2e237b9fbf092a03cf80e86d928ac7ca6 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 20 六月 2023 16:40:51 +0800
Subject: [PATCH] 孚能
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 2 +-
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 17 ++++++++++++++---
src/main/webapp/views/stoMan/stoQue.html | 15 ++++++---------
src/main/webapp/static/js/locMast/locMast.js | 2 +-
src/main/webapp/static/js/stoMan/stoQue.js | 2 +-
src/main/java/com/zy/asrs/entity/LocMast.java | 2 +-
src/main/resources/application.yml | 4 ++--
7 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index f096994..710ea2e 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -82,7 +82,7 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- if (entry.getKey().equals("loc_type2")){
+ if (entry.getKey().equals("loc_type1")){
wrapper.eq(entry.getKey(), val);
}else {
wrapper.like(entry.getKey(), val);
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index e114717..cfbf077 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -150,7 +150,7 @@
@TableField("error_memo")
private String errorMemo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鏄惁鍚姩1锛�0")
@TableField("ctn_kind")
private Integer ctnKind;
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 5177283..5b242eb 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -377,20 +377,20 @@
}
}else {
- //娴嬭瘯搴撲綅杞潤缃簱浣�
+ //娴嬭瘯搴撲綅杞潤缃簱浣嶅拰NG搴撲綅
if (locMast.getLocType1().equals((short)4)){
locMast.setPackStatus(4); //4:NG
}else {
locMast.setPackStatus(5); //5:闈欑疆涓�
}
sign=true;
- if (locMast.getLocType1()==2 && sourceLoc.getLocType1()==1){
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
.eq("loc_no",sourceLoc.getLocNo())
.eq("barcode",locDetl.getMatnr())
.eq("status",4)
);
testMast.setStatus(5);
+ testMast.setLocNo(locMast.getLocNo());
testMast.setModiTime(new Date());
if (!testMastService.update(testMast,new EntityWrapper<TestMast>()
.eq("loc_no",sourceLoc.getLocNo())
@@ -398,7 +398,7 @@
.eq("status",4))){
throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
}
- }
+
}
if (!locMastService.updateById(locMast)) {
// exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -510,8 +510,19 @@
combParam.setPackSts(1);//OK
combParam.setStepSts(7);//娴嬭瘯搴撳嚭搴撳畬鎴�
}else if(wrkMast.getStaNo()==204){//NG 鍑哄簱
+ //NG鍑哄簱淇敼娴嬭瘯妗ｇ殑鐘舵�佷负5.宸茬Щ搴�
+ TestMast testMast=testMastService.selectOne(new EntityWrapper<TestMast>()
+ .eq("user_id",wrkMast.getBarcode())
+ .eq("barcode",wrkDetls101.get(0).getMatnr()));
combParam.setPackSts(2);//NG
combParam.setStepSts(8);//NG鍑哄簱瀹屾垚
+ testMast.setStatus(5);
+ if(!testMastService.update(testMast,new EntityWrapper<TestMast>()
+ .eq("user_id",wrkMast.getBarcode())
+ .eq("barcode",wrkDetls101.get(0).getMatnr()))){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 淇敼娴嬭瘯琛ㄧ姸鎬佷负5澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+ }
}else if(wrkMast.getStaNo()==103){//鐩爣绔�103鍑哄簱
combParam.setPackSts(1);//OK
combParam.setStepSts(6);//闈欑疆搴撳嚭搴撳畬鎴�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 71f50fb..4395589 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
# tomcat:
@@ -12,7 +12,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=zjfnasrs
+ url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 5384f03..c596ee2 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -46,7 +46,7 @@
// ,{field: 'outEnable', align: 'center',title: ''}
// ,{field: 'ioTime$', align: 'center',title: ''}
// ,{field: 'firstTime$', align: 'center',title: ''}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'ctnKind', align: 'center',title: '鍚姩鎸夐挳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'text-decoration: underline;cursor:pointer'}
// ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 3d87289..1b52ae6 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -45,7 +45,7 @@
// return html;
// },width:80}
,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'ctnKind', align: 'center',title: '鍚姩鎸夐挳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
]],
diff --git a/src/main/webapp/views/stoMan/stoQue.html b/src/main/webapp/views/stoMan/stoQue.html
index 0e92375..57374f8 100644
--- a/src/main/webapp/views/stoMan/stoQue.html
+++ b/src/main/webapp/views/stoMan/stoQue.html
@@ -61,16 +61,13 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <select name="loc_type2" id="loc_type2" class="layui-input" type="text" placeholder="璁惧鍙�" autocomplete="off">
+ <select name="loc_type1" id="loc_type1" class="layui-input" type="text" placeholder="搴撲綅绫诲瀷" autocomplete="off">
<!-- <option style="display: none"></option>-->
- <option value="">璁惧鍙�</option>
- <option value="0">闈欑疆搴撲綅</option>
- <option value="1">1鍙�</option>
- <option value="2">2鍙�</option>
- <option value="3">3鍙�</option>
- <option value="4">4鍙�</option>
- <option value="5">5鍙�</option>
- <option value="6">6鍙�</option>
+ <option value="">搴撲綅绫诲瀷</option>
+ <option value="1">娴嬭瘯搴撲綅</option>
+ <option value="2">闈欑疆搴撲綅</option>
+ <option value="3">鏆傚瓨搴撲綅</option>
+ <option value="4">NG搴撲綅</option>
</select>
</div>
</div>
--
Gitblit v1.9.1