From 00620a6917d2c4b0df1f62366a489cfe6aed8be1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 一月 2025 15:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 126 +++++++++++++++++++++++++++++++++++------
1 files changed, 107 insertions(+), 19 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 8abe78b..0aef60c 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;
@@ -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;
@@ -2907,7 +2911,7 @@
if (inStn.getSourcePlcId() == 4 || inStn.getSourcePlcId() ==5){ //鐏岃绔欓渶瑕佽幏鍙栬緭閫佺嚎鐗╂枡浠ｇ爜
matnr = staProtocol.getMatnr();
batch = staProtocol.getBatch();
- anfme = Cools.isEmpty(staProtocol.getAnfme()) ? anfme:staProtocol.getAnfme().shortValue();
+ anfme = (Cools.isEmpty(staProtocol.getAnfme()) || staProtocol.getAnfme()==0) ? anfme:staProtocol.getAnfme().shortValue();
weight11 = staProtocol.getWeight1();
weight = weight11;
String memoBool = staProtocol.isBan()? "瀛樺湪":"涓嶅瓨鍦�";
@@ -3035,7 +3039,8 @@
if (inStn.getSourcePlcId() == 4){
matnr2 = staProtocol.getMatnr();
batch2 = staProtocol.getBatch();
- anfme2 = Cools.isEmpty(staProtocol.getAnfme2()) ? anfme2:staProtocol.getAnfme2().shortValue();
+ anfme2 = (Cools.isEmpty(staProtocol.getAnfme2()) || staProtocol.getAnfme2()==0) ? anfme2:staProtocol.getAnfme2().shortValue();
+
weight11 = staProtocol.getWeight1();
weight2 = weight11;
String memoBool = staProtocol.isBan()? "瀛樺湪":"涓嶅瓨鍦�";
@@ -3611,22 +3616,55 @@
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);
+ CreateComb(barcode, staProtocol.getMatnr().toString(),staProtocol.getWorkNo().intValue(),staProtocol.getBatch(),inSta);
}catch (IOException e) {
throw new CoolException(e);
}
} else if (waitPakin.getWeight() == null) {
- WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", staProtocol.getWorkNo().intValue()));
- if (Cools.isEmpty(wrkMastSta)){
- wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no2", staProtocol.getWorkNo().intValue()));
- if (Cools.isEmpty(wrkMastSta)){
- throw new CoolException("鏈壘鍒板搴旂殑浠诲姟淇℃伅");
+ try {
+ LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
+ SearchLocParam param = new SearchLocParam();
+ param.setBarcode(barcode);
+ 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);
}
- waitPakin.setWeight(wrkMastSta.getWeight2());
- }else {
- waitPakin.setWeight(wrkMastSta.getWeight());
+
+ } catch (Exception e) {
+ log.error(""+e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
- waitPakinService.update(waitPakin,new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
} else {
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
@@ -3668,6 +3706,7 @@
}
} catch (Exception e) {
+ log.error(""+e);
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
@@ -3681,7 +3720,54 @@
}
- 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")
+ .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(2, 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 = "";
@@ -3690,7 +3776,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("鏈壘鍒板搴旂殑浠诲姟淇℃伅");
@@ -3709,15 +3795,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