From bd1a2aef7fbe13e920c473b4f5e7ff5ba942c9a8 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 18 五月 2023 11:52:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 24 ++++++++++++
src/main/java/com/zy/asrs/entity/param/CombParam.java | 2 +
src/main/webapp/views/locMast/locMast_detail.html | 10 +++++
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 32 ++++++++++++++++
src/main/resources/mapper/LocMastMapper.xml | 1
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 8 ++++
src/main/java/com/zy/asrs/task/handler/StandingHandler.java | 4 +
src/main/java/com/zy/common/web/WcsController.java | 17 +++++---
src/main/webapp/static/js/locMast/locMast.js | 2 +
src/main/webapp/static/js/stoMan/stoQue.js | 1
src/main/java/com/zy/asrs/entity/LocMast.java | 15 +++++++
11 files changed, 108 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 3d386fd..e114717 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -194,6 +194,9 @@
@ApiModelProperty(value= "閫氶亾")
private Integer channel;
+ @ApiModelProperty(value= "鍐荤粨")
+ private Integer freeze;
+
public String getWhsType$(){
BasWhsService service = SpringUtils.getBean(BasWhsService.class);
@@ -282,6 +285,18 @@
}
}
+ public String getFreeze$() {
+ if (null == this.freeze){ return null; }
+ switch (this.freeze){
+ case 0:
+ return "姝ｅ父";
+ case 1:
+ return "鍐荤粨";
+ default:
+ return String.valueOf(this.locType3);
+ }
+ }
+
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 7c16356..04fc872 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -23,6 +23,8 @@
//PACK鐘舵��
private Integer packSts;
+ //姝ラ
+ private Integer stepSts;
// 鍗曟嵁缂栧彿
private String orderNo;
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 a04142d..f91ade5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -670,6 +670,14 @@
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
log.error("鐢宠娴嬭瘯澶辫触");
}
+ //3.寮�濮嬫祴璇曚笂鎶�
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(locMast.getBarcode());
+ combParam.setLocNo(locMast.getLocNo());
+ combParam.setPackSts(0);
+ combParam.setStepSts(3);
+ combParam.setRequestTime(DateUtils.convert(now));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
}
@Override
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 b4c5dd4..ce55486 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -82,6 +82,14 @@
}
if (targetLocNo != null){
workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
+ //4.娴嬭瘯瀹屾垚涓婃姤
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(locMast.getBarcode());
+ combParam.setLocNo(locMast.getLocNo());
+ combParam.setPackSts(2);
+ combParam.setStepSts(4);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
return SUCCESS;
}else {
log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->娌℃湁绌哄簱浣�!");
@@ -126,6 +134,14 @@
if (targetLocNo != null){
//鐢熸垚鍑哄簱浠诲姟
if (outLoc(locMast)){
+ //4.娴嬭瘯瀹屾垚涓婃姤
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(locMast.getBarcode());
+ combParam.setLocNo(locMast.getLocNo());
+ combParam.setPackSts(1);
+ combParam.setStepSts(4);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
return SUCCESS;
}
}else {
@@ -136,6 +152,14 @@
}
if (targetLocNo != null){
workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
+ //4.娴嬭瘯瀹屾垚涓婃姤
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(locMast.getBarcode());
+ combParam.setLocNo(locMast.getLocNo());
+ combParam.setPackSts(1);
+ combParam.setStepSts(4);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
return SUCCESS;
}else {
log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->娌℃湁绌哄簱浣�!");
diff --git a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
index 7ec9b28..6df2d13 100644
--- a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
@@ -64,7 +64,8 @@
.eq("fire_status", 0)
.eq("loc_sts", "F")
.eq("loc_type1",(short)2)
- .eq("pack_status", 5));
+ .eq("pack_status", 5)
+ .eq("freeze",0));
Integer ioType = 101; //鍏ュ嚭搴撶被鍨�
//闈欑疆瀹屾垚鍑哄簱绔�104
for(LocMast locMast : locMasts){
@@ -130,6 +131,7 @@
combParam.setPackNo(locMast.getBarcode());
combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(6);
+ combParam.setStepSts(1);
combParam.setRequestTime(DateUtils.convert(new Date()));
new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,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 b9f626e..3741792 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -172,6 +172,20 @@
throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
}
}
+ //2.鍏ュ簱瀹屾垚涓婃姤
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(wrkMast.getBarcode());
+ combParam.setLocNo(wrkMast.getLocNo());
+ if (locMast.getCrnNo()==1){
+ combParam.setPackSts(0);
+ combParam.setStepSts(2);
+ }else{
+ combParam.setPackSts(1);
+ combParam.setStepSts(5);
+ }
+
+ combParam.setRequestTime(DateUtils.convert(now));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.updateById(locMast)) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -333,6 +347,7 @@
locMast.setModiTime(now);
locMast.setFireStatus(0);
+ boolean sign =false;
if (locMast.getLocType1().equals(sourceLoc.getLocType1())){
locMast.setPackStatus(packStatus);
}else if (locMast.getLocType1().equals((short)1) && sourceLoc.getLocType1().equals((short)3)){
@@ -343,6 +358,7 @@
}else {
locMast.setPackStatus(5); //5:闈欑疆涓�
}
+ sign=true;
if (locMast.getLocType1()==1 && sourceLoc.getLocType1()==2){
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
.eq("loc_no",sourceLoc.getLocNo())
@@ -361,6 +377,22 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
+ if (locMast.getCrnNo()==1 && sign){
+ //5.闈欑疆搴撲綅鍏ュ簱瀹屾垚涓婃姤
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(wrkMast.getBarcode());
+ combParam.setLocNo(wrkMast.getLocNo());
+ if (locMast.getPackStatus()==4){
+ combParam.setPackSts(2);
+ }else if (locMast.getPackStatus()==5){
+ combParam.setPackSts(1);
+ }else {
+ combParam.setPackSts(0);
+ }
+ combParam.setStepSts(5);
+ combParam.setRequestTime(DateUtils.convert(now));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+ }
break;
default:
break;
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3a6f58f..66d1c52 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -189,13 +189,16 @@
if (!locMastService.updateById(locMast)){
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}else{
- //1.鎵爜涓婃姤
- CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(1);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- 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/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 9fd687c..fee4223 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -38,6 +38,7 @@
<result column="fire_status" property="fireStatus" />
<result column="pack_status" property="packStatus" />
<result column="channel" property="channel" />
+ <result column="freeze" property="freeze" />
</resultMap>
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index a823f63..5384f03 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -27,6 +27,7 @@
,{field: 'packStatus$', align: 'center',title: '浜у搧鐘舵��', hide:false}
,{field: 'locType1$', align: 'center',title: '搴撲綅绫诲瀷'}
,{field: 'locType2$', align: 'center',title: '娴嬭瘯璁惧鍙�'}
+ ,{field: 'freeze$', align: 'center',title: '鍐荤粨鐘舵��'}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
// ,{field: 'pltType', align: 'center',title: ''}
// ,{field: 'ctnType', align: 'center',title: ''}
@@ -518,6 +519,7 @@
fireNo: $('#fireNo').val(),
fireStatus: $('#fireStatus').val(),
packStatus: $('#packStatus').val(),
+ freeze: $('#freeze').val(),
};
$.ajax({
url: baseUrl+"/locMast/"+name+"/auth",
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 934eb69..be54683 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -32,6 +32,7 @@
,{field: 'packStatus$', align: 'center',title: '浜у搧鐘舵��', width: 90, style: 'color: #8E2323'}
,{field: 'locType1$', align: 'center',title: '搴撲綅绫诲瀷'}
,{field: 'locType2$', align: 'center',title: '娴嬭瘯璁惧鍙�'}
+ ,{field: 'freeze$', align: 'center',title: '鍐荤粨鐘舵��',width: 90}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
// ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�'}
diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index 436b16e..44446f0 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -98,6 +98,16 @@
</select>
</div>
</div>
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label"><span class="not-null">*</span>鍐荤粨鐘舵�侊細</label>
+ <div class="layui-input-inline">
+ <select id="freeze" class="layui-input" type="text">
+ <!-- <option style="display: none"></option>-->
+ <option value="0">姝ｅ父</option>
+ <option value="1">鍐荤粨</option>
+ </select>
+ </div>
+ </div>
<div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
--
Gitblit v1.9.1