From f0504befed64ea0776524658a4c89e9b0040ada0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 24 三月 2025 10:11:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 152 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 138 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index aa336ff..641d493 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -51,6 +51,8 @@
import java.util.*;
import java.util.stream.Collectors;
+import static com.zy.common.utils.RandomValidateCodeUtil.code;
+
/**
* 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔�
* Created by vincent on 2020/8/6
@@ -96,6 +98,8 @@
private MatnrCodeService matnrCodeService;
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private MatService matService;
@Value("${wms.url}")
private String wmsUrl;
@@ -1887,7 +1891,7 @@
log.error("鍙屾繁搴撲綅 --- 娴呭簱浣嶉樆濉炲紓甯革紒 寰呯Щ杞祬搴撲綅锛�" + shallowLoc.getLocNo());
throw new CoolException("鍙屾繁搴撲綅 --- 娴呭簱浣嶉樆濉炲紓甯革紒 寰呯Щ杞祬搴撲綅锛�" + shallowLoc.getLocNo());
}
-
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(0);
// 淇濆瓨宸ヤ綔妗�
@@ -1900,7 +1904,7 @@
wrkMast.setCrnNo(crn.getId());
wrkMast.setSourceLocNo(shallowLoc.getLocNo()); // 婧愬簱浣�
wrkMast.setLocNo(loc.getLocNo()); // 鐩爣搴撲綅
- wrkMast.setFullPlt(shallowLoc.getFullPlt()); // 婊℃澘
+ wrkMast.setFullPlt(Cools.isEmpty(locDetls)?"N":"Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("D") ? "Y" : "N"); // 绌烘澘
@@ -1914,7 +1918,7 @@
}
// 宸ヤ綔妗ｆ槑缁嗕繚瀛�
if (shallowLoc.getLocSts().equals("F")) {
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
+
for (LocDetl locDetl : locDetls) {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
@@ -2775,8 +2779,8 @@
short sta1 = 0;
short souSta2 = 0;
short sta2 = 0;
- Integer matnr = 0;
- Integer matnr2 = 0;
+ String matnr = "0";
+ String matnr2 = "0";
String batch = "";
String batch2 = "";
short type = 0;
@@ -3081,10 +3085,26 @@
command.setWeight2(weight2);
if (workNo1 == 0 && workNo2 !=0){
+ if("0".equals(matnr2) || "".equals(batch2) ){
+ log.error("婧愮珯"+souSta2+"宸ヤ綅涓�浠诲姟缂哄皯淇℃伅锛岀墿鏂欎唬鐮�:"+matnr+",batch:"+batch);
+ continue;
+ }
command.setTaskMode(RgvTaskModeType.FETCH_PUT2); // 浠诲姟妯″紡: 2鍙栨斁璐�
} else if (workNo1 != 0 && workNo2 ==0) {
+ if("0".equals(matnr) || "".equals(batch) ){
+ log.error("婧愮珯"+souSta1+"宸ヤ綅浜屼换鍔＄己灏戜俊鎭紝鐗╂枡浠ｇ爜:"+matnr+",batch:"+batch);
+ continue;
+ }
command.setTaskMode(RgvTaskModeType.FETCH_PUT1); // 浠诲姟妯″紡: 1鍙栨斁璐�
}else {
+ if("0".equals(matnr) || "".equals(batch) ){
+ log.error("婧愮珯"+souSta1+"宸ヤ綅涓�浠诲姟缂哄皯淇℃伅锛岀墿鏂欎唬鐮�:"+matnr+",batch:"+batch);
+ continue;
+ }
+ if("0".equals(matnr2) || "".equals(batch2) ){
+ log.error("婧愮珯"+souSta2+"宸ヤ綅浜屼换鍔＄己灏戜俊鎭紝鐗╂枡浠ｇ爜:"+matnr+",batch:"+batch);
+ continue;
+ }
command.setTaskMode(RgvTaskModeType.FETCH_PUT_ALL); // 浠诲姟妯″紡: all鍙栨斁璐�
}
command.setCommand(false);
@@ -3428,6 +3448,11 @@
wrkMast.setWrkSts(105L);
wrkMast.setModiTime(date);
wrkMastService.updateById(wrkMast);
+ } else if (wrkMast.getIoType() == 105){
+ Date date = new Date();
+ wrkMast.setWrkSts(14L);
+ wrkMast.setModiTime(date);
+ wrkMastService.updateById(wrkMast);
}
}
@@ -3611,10 +3636,59 @@
// 鑾峰彇鍏ュ簱閫氱煡妗�
WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
if (Cools.isEmpty(waitPakin)) {
- try {
- CreateComb(barcode, staProtocol.getMatnr(),staProtocol.getWorkNo().intValue(),staProtocol.getBatch(),inSta);
- }catch (IOException e) {
- throw new CoolException(e);
+ WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode).eq("io_type", 105));
+ if (Cools.isEmpty(mast)) {
+ try {
+ CreateComb(barcode, staProtocol.getMatnr().toString(),staProtocol.getWorkNo().intValue(),staProtocol.getBatch(),inSta);
+ }catch (IOException e) {
+ throw new CoolException(e);
+ }
+ } else {
+ try {
+ LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
+ SearchLocParam param = new SearchLocParam();
+ param.setBarcode(barcode);
+ param.setBatch(staProtocol.getBatch());
+ param.setIoType(105);
+ param.setSourceStaNo(inSta.getStaNo());
+ param.setLocType1(locTypeDto.getLocType1());
+ String response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath("/rpc/process/in/loc/v1")
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
+ if (jsonObject.getInteger("code").equals(200)) {
+ StartupDto dto = jsonObject.getObject("data", StartupDto.class);
+
+ barcodeThread.setBarcode("");
+ staProtocol.setWorkNo(dto.getWorkNo().shortValue());
+ staProtocol.setStaNo(dto.getStaNo().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ ledThread.errorReset();
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ if (!result) {
+ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ }
+ } else if(jsonObject.getInteger("code").equals(700)) {
+ log.error(barcode + "鎵樼洏璇嗗埆寮傚父锛岃鍏堣繘琛岀粍鎵橈紒");
+ // led 寮傚父鏄剧ず
+ ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
+ if (ledThread != null) {
+ String errorMsg = barcode + "鎵樼洏璇嗗埆寮傚父锛岃鍏堣繘琛岀粍鎵橈紒";
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+ }
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/process/in/loc/v1", JSON.toJSONString(param), response);
+ }
+
+ } catch (Exception e) {
+ log.error(""+e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
}
} else if (waitPakin.getWeight() == null) {
WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", staProtocol.getWorkNo().intValue()));
@@ -3683,7 +3757,55 @@
}
- public void CreateComb(String barcode,Integer code,Integer wrkNo,String batch,DevpSlave.Sta inSta) throws IOException {
+ public synchronized void getNeed() {
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ if (devp.getId() != 2) {
+ continue;
+ }
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ if (devpThread.isCalled == 1) {
+ try {
+ String response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath("/rpc/process/loc/v1")
+ .setJson(JSON.toJSONString(""))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ log.info("浠诲姟涓嬪彂鎴愬姛");
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, null));
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況esponse锛歿}", wmsUrl + "/mobile/comb/auth", response);
+ }
+ Thread.sleep(1000);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ if (devpThread.isFinish == 1) {
+
+ Integer weight = devpThread.weight;
+ Integer isHalf = devpThread.isHalf;
+ WrkMast lastWrkMast105 = wrkMastService.getLastWrkMast105();
+ if (Cools.isEmpty(lastWrkMast105)) continue;
+ List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(lastWrkMast105.getWrkNo());
+ if (!Cools.isEmpty(wrkDetls)) {
+ for (WrkDetl wrkDetl : wrkDetls) {
+ wrkDetl.setWeight(weight.doubleValue());
+ if (isHalf == 1) {
+ wrkDetl.setMemo("瀛樺湪鍗婃《");
+ } else {
+ wrkDetl.setMemo("涓嶅瓨鍦ㄥ崐妗�");
+ }
+ wrkDetlService.updateById(wrkDetl);
+ }
+ }
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(5, null));
+ }
+ }
+ }
+ public void CreateComb(String barcode,String code,Integer wrkNo,String batch,DevpSlave.Sta inSta) throws IOException {
Double anfme = 0d;
Double weight = 0d;
String memo = "";
@@ -3692,7 +3814,7 @@
if (Cools.isEmpty(wrkMastSta)){
wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no2", wrkNo));
if (Cools.isEmpty(wrkMastSta)){
- if (code >0 && !Cools.isEmpty(batch)){
+ if (!Cools.isEmpty(batch)){
anfme = 1d;
}else {
throw new CoolException("鏈壘鍒板搴旂殑浠诲姟淇℃伅");
@@ -3711,15 +3833,17 @@
weight = wrkMastSta.getWeight();
memo = wrkMastSta.getMemo();
}
- MatnrCode matnrCode = matnrCodeService.selectByCode(code);
- if (Cools.isEmpty(matnrCode)){
+ ////
+// MatnrCode matnrCode = matnrCodeService.selectByCode(code);
+ Mat mat = matService.selectByCode(code);
+ if (Cools.isEmpty(mat)){
throw new CoolException("鏈壘鍒板搴旂殑鐗╂枡淇℃伅");
}
CombParam combParam = new CombParam();
ArrayList<CombParam.CombMat> combMats = new ArrayList<>();
CombParam.CombMat combMat = new CombParam.CombMat();
combParam.setBarcode(barcode);
- combMat.setMatnr(matnrCode.getMatnr());
+ combMat.setMatnr(mat.getMatnr());
combMat.setBatch(batch);
combMat.setAnfme(anfme);
combMat.setWeight(weight);
--
Gitblit v1.9.1