From 98b770b88b356b682260065f0449d4f453ba7c3b Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 15 五月 2023 13:45:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/TestMast.java | 2 +
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 14 ++++---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 7 ++-
src/main/webapp/views/mat/mat.html | 4 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 8 ----
src/main/java/com/zy/common/web/WcsController.java | 18 +++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 11 +----
src/main/java/com/zy/common/service/CommonService.java | 8 ++-
src/main/resources/application.yml | 4 +-
src/main/java/com/zy/asrs/utils/PostMesDataUtils.java | 2
10 files changed, 46 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TestMast.java b/src/main/java/com/zy/asrs/entity/TestMast.java
index 5788bfc..a5daaad 100644
--- a/src/main/java/com/zy/asrs/entity/TestMast.java
+++ b/src/main/java/com/zy/asrs/entity/TestMast.java
@@ -22,6 +22,8 @@
/**
* 缂栧彿
+ *
+ *
*/
@ApiModelProperty(value= "缂栧彿")
@TableId(value = "id", type = IdType.AUTO)
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 41d12c2..6263465 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -685,14 +685,6 @@
locMast.setPackStatus(1);
locMast.setModiTime(now);
-
- 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 (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
throw new CoolException("鐢宠娴嬭瘯澶辫触");
}
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 0506530..4722c0b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -604,7 +604,7 @@
matNew.setTagId(tag.getId());
matNew.setMatnr(param.getPackName());
matNew.setMaktx(param.getPackName());
- matNew.setDeadWarn(param.getSettingTimes());
+ matNew.setDeadWarn(mat.getDeadWarn());
matNew.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
matNew.setCreateTime(new Date());
matNew.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
@@ -761,14 +761,9 @@
throw new CoolException("鏇存柊娴嬭瘯鐘舵�佸け璐�");
}
locMast.setPackStatus(2);
- CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(2);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
-
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
+
+
throw new CoolException("鏇存柊浜у搧鐘舵�佸け璐�");
}
} else if (Cools.isEmpty(testMast.getStatus())){
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 34ec9c5..b55974a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -217,9 +217,12 @@
}
Integer outSta = staNo.getDevNo();
- //2鍙峰爢鍨涙満鍏ㄦ澘鍑哄簱绔欐寚瀹氫负204绔欙紝鎷ｆ枡绔欐寚瀹氫负202
+ //2鍙峰爢鍨涙満鍏ㄦ澘鍑哄簱绔欐寚瀹氫负103
if(locMast.getCrnNo()==2){
- outSta = ioType == 101 ? 204 : 202;
+ outSta = 103;
+ //鍑哄簱绔欑偣涓�205锛�
+ }else if(staNo.getDevNo()==205){
+
}
// 鑾峰彇璺緞
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 7b4bd8c..adf9caa 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -163,6 +163,14 @@
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }else {
+ //2.鍏ュ簱瀹屾垚
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(locMast.getBarcode());
+ combParam.setLocNo(locMast.getLocNo());
+ combParam.setPackSts(2);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
}
}
break;
@@ -335,12 +343,6 @@
throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
}
}
- CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(5);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
}
if (!locMastService.updateById(locMast)) {
// exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
diff --git a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
index b8dee0f..0b46fe5 100644
--- a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
+++ b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
@@ -26,7 +26,7 @@
String response = "";
boolean success = false;
try {
-// Map<String, Object> map = new HashMap<>();
+// Map<String, Object> map = new HashMap<>()
// map.put("appkey","ea1f0459efc02a79f046f982767939ae");
response = new HttpHandler.Builder()
// .setHeaders(map)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 1534f8d..71ddedc 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -102,10 +102,10 @@
@Transactional
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
- if (sourceStaNo.equals(100)) {
+ if (sourceStaNo.equals(202)) {
whsType = 1;
locTypeDto.setLocType1((short) 1);
- } else if (sourceStaNo.equals(200)) {
+ } else if (sourceStaNo.equals(209)) {
whsType = 2;
locTypeDto.setLocType1((short) 2);
}
@@ -169,7 +169,9 @@
Short locType2 = getLocType2Small(curRow, locTypeDto.getLocType1());
locMast = locMastService.queryFreeLocMast2(curRow, locTypeDto.getLocType1(), locType2);
} else { //榛樿瑙勫垯
- locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
+
+
+
}
// 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 8fb2c05..96df0d0 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -3,10 +3,13 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
@@ -14,6 +17,7 @@
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -43,6 +47,12 @@
private WaitPakinService waitPakinService;
@Autowired
private LocDetlService locDetlService;
+
+ @Value("mes.url")
+ private String mesUrl;
+
+ @Value("mes.inPath")
+ private String inpath;
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -176,6 +186,14 @@
locMast.setModiTime(now);
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);
}
} else {
throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9c07a52..4282afd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,7 +12,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=zjfnasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=zjfnasrs
username: sa
password: sa@123
mvc:
@@ -66,7 +66,7 @@
# 鍏呮斁鐢垫祴璇曢�氶亾
channel:
# 鏈�澶ч�氶亾鏁�
- channelMax: 48
+ channelMax: 24
# 鍏呮斁鐢垫祴璇曟煖鏁伴噺
equipmentCount: 6
# 娴嬭瘯搴撲綅鎵�鍦ㄦ帓鍙�
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index da02f1f..7966f6d 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -245,9 +245,9 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曠浣撶Н</label>
+ <label class="layui-form-label">闈欑疆鏃堕暱(鍒嗛挓)</label>
<div class="layui-input-block">
- <input name="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">
+ <input name="deadWarn" placeholder="璇疯緭鍏ラ潤缃椂闀�" class="layui-input">
</div>
</div>
--
Gitblit v1.9.1