From 1cc21b53d3ffc35d37f0dd2dc4bb924f2278c278 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 13 十一月 2024 10:13:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 812 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 717 insertions(+), 95 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 c8e653d..15ed411 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -94,6 +94,8 @@
private WrkMastStaService wrkMastStaService;
@Autowired
private MatnrCodeService matnrCodeService;
+ @Autowired
+ private WaitPakinService waitPakinService;
@Value("${wms.url}")
private String wmsUrl;
@@ -153,6 +155,250 @@
errMsg = errMsg+"瓒呴噸";
back = true;
}
+ if (staProtocol.isBarcodeErr()) {
+ errMsg = errMsg+"鎵爜澶辫触";
+ back = true;
+ }
+ // 閫�鍥�
+ if (back) {
+ // led 寮傚父鏄剧ず
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
+ if (ledThread != null) {
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
+ }
+ continue;
+ }
+
+ if (!Cools.isEmpty(barcode)) {
+ log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
+ if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ continue;
+ }
+ } else {
+ // led 寮傚父鏄剧ず
+// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
+// if (ledThread != null) {
+// String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
+// MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+// }
+ continue;
+ }
+ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
+ if (staProtocol.isAutoing()
+ && staProtocol.isLoading()
+ && staProtocol.isInEnable()
+ && !staProtocol.isEmptyMk()
+ && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() > 9990)
+ && staProtocol.isPakMk()) {
+
+ if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
+ //鏉＄爜涓虹┖鎴栬�呬笉绗﹀悎锛岄��搴撳埌
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
+ if (ledThread != null) {
+ String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+ }
+// staProtocol.setWorkNo((short)9999);
+// staProtocol.setStaNo((short)(staProtocol.getStaNo()-1));
+// devpThread.setPakMk(staProtocol.getSiteId(), false);
+// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// if (!result) {
+// throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+// }
+ continue;
+ }
+
+ // 鍒ゆ柇閲嶅宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ if (barcode.length() == 8) {
+ wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
+ if (wrkMast != null) {
+ log.error("宸ヤ綔妗ｄ腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
+ continue;
+ }
+ }
+// 鑾峰彇鍏ュ簱閫氱煡妗�
+// List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
+// if (waitPakins.isEmpty()) {
+// log.error("鏃犳鍏ュ簱鏉＄爜鏁版嵁銆傛潯鐮佸彿={}", barcode);
+// continue;
+// }
+
+ try {
+ LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
+ SearchLocParam param = new SearchLocParam();
+ param.setBarcode(barcode);
+ param.setIoType(1);
+ param.setSourceStaNo(inSta.getStaNo());
+ param.setLocType1(locTypeDto.getLocType1());
+ String response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath("/rpc/pakin/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)) {
+// staProtocol.setWorkNo((short) 9999);
+// staProtocol.setStaNo(inSta.getBackSta().shortValue());
+// devpThread.setPakMk(staProtocol.getSiteId(), false);
+// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// // led 寮傚父鏄剧ず
+// if (ledThread != null) {
+// String errorMsg = barcode + "鎵樼洏璇嗗埆寮傚父锛岃鍏堣繘琛岀粍鎵橈紒";
+// MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+// }
+ 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/pakin/loc/v1", JSON.toJSONString(param), response);
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
+
+ }
+ }
+
+ }
+ public synchronized void generateStoreWrkFile7() {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鍏ュ簱鍙�
+ for (DevpSlave.Sta inSta : devp.getInSta7()) {
+
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
+ String barcode = barcodeThread.getBarcode();
+
+ // 灏哄妫�娴嬪紓甯�
+ boolean back = false;
+ String errMsg = "寮傚父锛�";
+ if (staProtocol.isFrontErr()) {
+ errMsg = errMsg+"鍓嶈秴闄愶紱";
+ back = true;
+ }
+ if (staProtocol.isBackErr()) {
+ errMsg = errMsg+"鍚庤秴闄�";
+ back = true;
+ }
+ if (staProtocol.isHighErr()) {
+ errMsg = errMsg+"楂樿秴闄�";
+ back = true;
+ }
+ if (staProtocol.isLeftErr()) {
+ errMsg = errMsg+"宸﹁秴闄�";
+ back = true;
+ }
+ if (staProtocol.isRightErr()) {
+ errMsg = errMsg+"鍙宠秴闄�";
+ back = true;
+ }
+ if (staProtocol.isWeightErr()) {
+ errMsg = errMsg+"瓒呴噸";
+ back = true;
+ }
+
+ if (staProtocol.isBan()){
+
+ // 閫�鍥�
+ if (back) {
+ // led 寮傚父鏄剧ず
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
+ if (ledThread != null) {
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
+ }
+ continue;
+ }
+
+ if (staProtocol.getStaNoEnd() != 2001){
+ log.error(staProtocol.getStaNo()+"绔欑偣锛岀┖妗讹紝闈炴硶鐩爣绔欙紒锛侊紒锛侊紒锛�"+staProtocol.getStaNoEnd().toString());
+ continue;
+ }
+ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
+ if (staProtocol.isAutoing()
+ && staProtocol.isLoading()
+ && staProtocol.isInEnable()
+ && !staProtocol.isEmptyMk()
+ && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() > 9990)
+ && staProtocol.isPakMk()) {
+ Integer workNo1 = commonService.getWorkNo(3);
+ Date now = new Date();
+ // 淇濆瓨宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo1);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(101L); // 宸ヤ綔鐘舵�侊細101.鍒濆
+ wrkMast.setIoType(199); // 鍏ュ嚭搴撶姸鎬侊細 199.杞Щ
+ wrkMast.setIoPri(15D);
+ wrkMast.setCrnNo(0);
+ wrkMast.setSourceStaNo(staProtocol.getStaNo().intValue()); // 婧愮珯
+ wrkMast.setStaNo(staProtocol.getStaNoEnd().intValue()); // 鐩爣绔�
+ wrkMast.setFullPlt("N"); // 婊℃澘
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("Y"); // 绌烘澘
+ wrkMast.setBarcode("KB888888"); // 鎵樼洏鐮�
+ wrkMast.setLinkMis("N");
+ wrkMast.setCtnNo("Y"); // 鍏ュ簱闃诲搴撲綅绉昏浆鏍囪
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ int res = wrkMastMapper.insert(wrkMast);
+ if (res == 0) {
+// throw new CoolException("");
+ log.error(staProtocol.getStaNo()+"绔欑偣锛岀┖妗讹紝淇濆瓨宸ヤ綔妗ｄ富妗ｅけ璐ワ紒锛侊紒锛侊紒锛�"+now.toString());
+ continue;
+ }
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
+
+// StaProtocol staProtocol1 = new StaProtocol();
+ staProtocol.setWorkNo(workNo1.shortValue());
+ staProtocol.setStaNo((short)3001);
+ 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绔欑偣淇℃伅澶辫触");
+ }
+ }
+
+ continue;
+ }
+
if (staProtocol.isBarcodeErr()) {
errMsg = errMsg+"鎵爜澶辫触";
back = true;
@@ -535,6 +781,7 @@
if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())
&& crnProtocol.statusType == CrnStatusType.WAITING
&& crnProtocol.forkPosType == CrnForkPosType.HOME) {
+ log.error("鍫嗗灈鏈虹瓑寰呯‘璁わ紒锛侊紒 [宸ヤ綔鍙�:{}]", crnProtocol.getTaskNo());
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
if (crnProtocol.getCrnNo() !=5){
@@ -1160,6 +1407,7 @@
}
// 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
+ log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�併�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
if (crnProtocol.getTaskNo() == 9999) {
// 鍫嗗灈鏈哄浣�
crnThread.setResetFlag(true);
@@ -2065,10 +2313,14 @@
List<StaDesc> staDescs = staDescService.selectList(new EntityWrapper<StaDesc>().eq("type_no", 10).eq("stn_no", sta.getStaNo()));
for (StaDesc staDesc:staDescs){
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", staDesc.getCrnStn()));
+ BasDevp basDevp = new BasDevp();
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("crn_no", staDesc.getCrnNo()).gt("io_type", 100));
- if (!Cools.isEmpty(wrkMast)){
+ if (staDesc.getCrnNo() == 1){
+ basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 1004));
+ } else if (staDesc.getCrnNo() == 2) {
+ basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 1008));
+ }
+ if (Cools.isEmpty(basDevp)){
continue;
}
@@ -2076,7 +2328,7 @@
&& basDevp.getWrkNo() == 0 && basDevp.getCanining().equals("Y")){
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo((short) 9997);
- staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ staProtocol.setStaNo((short) (basDevp.getDevNo()==1004?1003:1013));
// staProtocol.setStaNo((short) 1013);
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocol));
@@ -2146,11 +2398,19 @@
// && staProtocol.isEmptyMk()
&& staProtocol.getWorkNo() == 0
) {
- WrkMast pakoutEmpty = wrkMastMapper.selectPakoutEmpty(sta.getStaNo());
+ Integer staNo = sta.getStaNo();
+ switch (staProtocol.getSiteId()){
+ case 4007:
+ staNo = 4002;break;
+ case 4016:
+ staNo = 4011;break;
+ }
+ WrkMast pakoutEmpty = wrkMastMapper.selectPakoutEmpty(staNo);
if (null != pakoutEmpty) {
return;
}
- List<StaDesc> staDescs = staDescService.selectList(new EntityWrapper<StaDesc>().eq("stn_no", sta.getStaNo()));
+
+ List<StaDesc> staDescs = staDescService.selectList(new EntityWrapper<StaDesc>().eq("stn_no", staNo));
for (StaDesc staDesc: staDescs){
BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", staDesc.getCrnNo()));
if (!basCrnp.getCrnSts().equals(3) || basCrnp.getCrnErr() != 0){
@@ -2159,6 +2419,7 @@
try {
HashMap<String, Object> map = new HashMap<>();
map.put("crnNo", staDesc.getCrnNo());//鐩爣绔�
+ map.put("staNo",staDesc.getStnNo());
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setParams(map)
@@ -2265,7 +2526,7 @@
crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX(locMast.getRow1()==9?(short)4:(short)5); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞�
crnCommand.setLocType1(locMast.getLocType1().shortValue()); // 璐х墿绫诲瀷
@@ -2410,7 +2671,7 @@
crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- crnCommand.setSourcePosX(locMast.getRow1()==9?(short)4:(short)5); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosX(locMast.getRow1().shortValue()); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY(locMast.getBay1().shortValue()); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ(locMast.getLev1().shortValue()); // 婧愬簱浣嶅眰
crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
@@ -2501,6 +2762,10 @@
}else {
rgvProtocol = rgvProtocol.clone();
}
+ List<WrkMastSta> wrkMastStas = wrkMastStaService.selectRGVTask1(rgvSlave.getId());
+ if (!Cools.isEmpty(wrkMastStas)){
+ continue;
+ }
if (rgvProtocol.getModeType() == RgvModeType.AUTO && rgvProtocol.getStatusType() == RgvStatusType.IDLE && rgvProtocol.getLoaded1() == 0){
boolean work1 = false;
boolean work2 = false;
@@ -2516,20 +2781,40 @@
String batch2 = "";
short type = 0;
short type2 = 0;
- short anfme = 0;
- short anfme2 = 0;
+ short anfme = 4;
+ short anfme2 = 4;
+ Double weight = 0d;
+ Double weight2 = 0d;
+ Double weight11 = 0d;
+ String memo = "";
+ String memo2 = "";
+ List<RgvSlave.Sta> inStn1 = rgvSlave.getInStn();
+ if (rgvProtocol.getColumnNumber()>4){
+ short rgvStaNo = Utils.getRgvStaNo(rgvSlave.getId(), inStn1.get(0).getSourceStaNo());
+ if (rgvStaNo<5){
+ Collections.reverse(inStn1);
+ }
+ }
//宸ヤ綅涓�浠诲姟
- for (RgvSlave.Sta inStn : rgvSlave.getInStn()){
+ for (RgvSlave.Sta inStn : inStn1){
+ work1 = false;
+ workNo1 = 0;
+ souSta1 = 0;
+ sta1 = 0;
+ type = 0;
+ if (rgvSlave.getId() == 1 && inStn.getSourceStaNo() == 2114){
+ continue;
+ }
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, inStn.getSourcePlcId());
StaProtocol staProtocol = devpThread.getStation().get(inStn.getSourceStaNo());
if (staProtocol == null) {
- break;
-// continue;
+// break;
+ continue;
} else {
staProtocol = staProtocol.clone();
}
- if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk() && staProtocol.getWorkNo()>0){
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk() && (staProtocol.getWorkNo()>0 && staProtocol.getWorkNo()<9900)){
WrkMast wrkMast = wrkMastService.selectByworkNo(staProtocol.getWorkNo());
if (Cools.isEmpty(wrkMast)){
@@ -2539,10 +2824,97 @@
workNo1 = wrkMast.getWrkNo();
souSta1 = Utils.getRgvStaNo(rgvSlave.getId(),staProtocol.getSiteId());
sta1 = Utils.getRgvEndStaNo(rgvSlave.getId(),wrkMast.getStaNo());
+ Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta1);
+ BasDevp devp = basDevpService.selectById(staNo);
+ if (devp.getWrkNo()!=0 || Cools.isEmpty(devp.getLoading()) || devp.getLoading().equals("Y")){
+ continue;
+ }
work1 = true;
devpThread.setPakMk(inStn.getSourceStaNo(),false);
break;
+
+ } else if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk() && (staProtocol.getWorkNo()>=9900 || staProtocol.getWorkNo()==0)) {
+ if (rgvSlave.getId() != 2 ){
+ continue;
+ }
+ workNo1 = workNo++;
+ souSta1 = Utils.getRgvStaNo(rgvSlave.getId(),inStn.getSourceStaNo());
+ if (inStn.getSourceStaNo() == 4007 && staProtocol.getTongType() == 1){
+ sta1 = Utils.getRgvStaNo(rgvSlave.getId(),2103);
+ } else if (inStn.getSourceStaNo() == 4007 && staProtocol.getTongType() == 2) {
+ sta1 = Utils.getRgvStaNo(rgvSlave.getId(),2002);
+ } else if (inStn.getSourceStaNo() == 4007 && staProtocol.getTongType() == 4) {
+ if (staProtocol.getStaNoEnd() == 3007 || staProtocol.getStaNoEnd() == 3012){
+ sta1 = Utils.getRgvStaNo(rgvSlave.getId(),2103);
+ } else if (staProtocol.getStaNoEnd() == 2001 ){
+ sta1 = Utils.getRgvStaNo(rgvSlave.getId(),2002);
+ } else {
+ log.error("4007绔欑偣锛屾《鍨�4锛岄潪娉曠洰鏍囩珯锛侊紒锛侊紒锛侊紒"+staProtocol.getStaNoEnd().toString());
+ continue;
+ }
+ Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta1);
+ BasDevp devp = basDevpService.selectById(staNo);
+ if (devp.getWrkNo()!=0 || Cools.isEmpty(devp.getLoading()) || devp.getLoading().equals("Y")){
+ continue;
+ }
+ workNo1 = commonService.getWorkNo(3);
+ Date now = new Date();
+ // 淇濆瓨宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo1);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(101L); // 宸ヤ綔鐘舵�侊細101.鍒濆
+ wrkMast.setIoType(199); // 鍏ュ嚭搴撶姸鎬侊細 199.杞Щ
+ wrkMast.setIoPri(15D);
+ wrkMast.setCrnNo(0);
+ wrkMast.setSourceStaNo(4007); // 婧愮珯
+ wrkMast.setStaNo(staProtocol.getStaNoEnd().intValue()); // 鐩爣绔�
+ wrkMast.setFullPlt("N"); // 婊℃澘
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("Y"); // 绌烘澘
+ wrkMast.setBarcode("KB888888"); // 鎵樼洏鐮�
+ wrkMast.setLinkMis("N");
+ wrkMast.setCtnNo("Y"); // 鍏ュ簱闃诲搴撲綅绉昏浆鏍囪
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ int res = wrkMastMapper.insert(wrkMast);
+ if (res == 0) {
+// throw new CoolException("");
+ log.error("4007绔欑偣锛屾《鍨�4锛屼繚瀛樺伐浣滄。涓绘。澶辫触锛侊紒锛侊紒锛侊紒"+now.toString());
+ continue;
+ }
+ type = 2;
+ } else if (inStn.getSourceStaNo() == 2102 && staProtocol.isFullPlt()) {
+ sta1 = Utils.getRgvStaNo(rgvSlave.getId(),2301);
+ } else {
+ sta1 = Utils.getRgvStaNo(rgvSlave.getId(),inStn.getStaNo());
+ }
+
+ if (inStn.getSourceStaNo() == 2102 && staProtocol.isEmptyMk()){ //鍖哄垎绌烘澘
+ type = 1;
+ }
+ if(inStn.getSourceStaNo() == 2102){
+ weight = staProtocol.getWeight().doubleValue()/10;
+ }
+ Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta1);
+ BasDevp devp = basDevpService.selectById(staNo);
+ if (devp.getWrkNo()!=0 || Cools.isEmpty(devp.getLoading()) || devp.getLoading().equals("Y")){
+ continue;
+ }
+ work1 = true;
+ if (inStn.getSourcePlcId() == 4 || inStn.getSourcePlcId() ==5){ //鐏岃绔欓渶瑕佽幏鍙栬緭閫佺嚎鐗╂枡浠ｇ爜
+ matnr = staProtocol.getMatnr();
+ batch = staProtocol.getBatch();
+ anfme = Cools.isEmpty(staProtocol.getAnfme()) ? anfme:staProtocol.getAnfme().shortValue();
+ weight11 = staProtocol.getWeight1();
+ weight = weight11;
+ String memoBool = staProtocol.isBan()? "瀛樺湪":"涓嶅瓨鍦�";
+ memo = memoBool+"鍗婃《";
+ }
+ devpThread.setPakMk(inStn.getSourceStaNo(),false);
+ break;
}
}
@@ -2550,18 +2922,26 @@
if (rgvSlave.getId() != 3){
//宸ヤ綅浜屼换鍔�
for (RgvSlave.Sta inStn : rgvSlave.getInStn()){
+ work2 = false;
+ workNo2 = 0;
+ souSta2 = 0;
+ sta2 = 0;
+ type2 = 0;
if (souSta1 == inStn.getSourceStaNo()){
+ continue;
+ }
+ if (rgvSlave.getId() == 1 && inStn.getSourceStaNo() == 1014){
continue;
}
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, inStn.getSourcePlcId());
StaProtocol staProtocol = devpThread.getStation().get(inStn.getSourceStaNo());
if (staProtocol == null) {
- break;
-// continue;
+// break;
+ continue;
} else {
staProtocol = staProtocol.clone();
}
- if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()&& staProtocol.isPakMk() && staProtocol.getWorkNo()>0){
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()&& staProtocol.isPakMk() && (staProtocol.getWorkNo()>0 && staProtocol.getWorkNo()<9900)){
WrkMast wrkMast = wrkMastService.selectByworkNo(staProtocol.getWorkNo());
if (Cools.isEmpty(wrkMast)){
@@ -2569,12 +2949,101 @@
continue;
}
workNo2 = wrkMast.getWrkNo();
- souSta2 = inStn.getSourceStaNo().shortValue();
+ souSta2 = Utils.getRgvStaNo(rgvSlave.getId(),staProtocol.getSiteId());
sta2 = Utils.getRgvEndStaNo(rgvSlave.getId(),wrkMast.getStaNo());
+ Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta2);
+ BasDevp devp2 = basDevpService.selectById(staNo);
+ if (devp2.getWrkNo()!=0 || Cools.isEmpty(devp2.getLoading()) || devp2.getLoading().equals("Y")){
+ continue;
+ }
+
work2 = true;
devpThread.setPakMk(inStn.getSourceStaNo(),false);
break;
+ } else if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk() && (staProtocol.getWorkNo()>=9900 || staProtocol.getWorkNo()==0)) {
+ if (rgvSlave.getId() != 2 ){
+ continue;
}
+ workNo2 = workNo++;
+ souSta2 = Utils.getRgvStaNo(rgvSlave.getId(),inStn.getSourceStaNo());
+ if (inStn.getSourceStaNo() == 4007 && staProtocol.getTongType() == 1){
+ sta2 = Utils.getRgvStaNo(rgvSlave.getId(),2103);
+ } else if (inStn.getSourceStaNo() == 4007 && staProtocol.getTongType() == 2) {
+ sta2 = Utils.getRgvStaNo(rgvSlave.getId(),2002);
+ } else if (inStn.getSourceStaNo() == 4007 && staProtocol.getTongType() == 4) {
+ if (staProtocol.getStaNoEnd() == 3007 || staProtocol.getStaNoEnd() == 3012){
+ sta2 = Utils.getRgvStaNo(rgvSlave.getId(),2103);
+ } else if (staProtocol.getStaNoEnd() == 2001 ){
+ sta2 = Utils.getRgvStaNo(rgvSlave.getId(),2002);
+ } else {
+ log.error("4007绔欑偣锛屾《鍨�4锛岄潪娉曠洰鏍囩珯锛侊紒锛侊紒锛侊紒"+staProtocol.getStaNoEnd().toString());
+ continue;
+ }
+ Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta2);
+ BasDevp devp2 = basDevpService.selectById(staNo);
+ if (devp2.getWrkNo()!=0 || Cools.isEmpty(devp2.getLoading()) || devp2.getLoading().equals("Y")){
+ continue;
+ }
+ workNo2 = commonService.getWorkNo(3);
+ Date now = new Date();
+ // 淇濆瓨宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo2);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(101L); // 宸ヤ綔鐘舵�侊細101.鍒濆
+ wrkMast.setIoType(199); // 鍏ュ嚭搴撶姸鎬侊細 199.杞Щ
+ wrkMast.setIoPri(15D);
+ wrkMast.setCrnNo(0);
+ wrkMast.setSourceStaNo(4007); // 婧愮珯
+ wrkMast.setStaNo(staProtocol.getStaNoEnd().intValue()); // 鐩爣绔�
+ wrkMast.setFullPlt("N"); // 婊℃澘
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("Y"); // 绌烘澘
+ wrkMast.setBarcode("KB888888"); // 鎵樼洏鐮�
+ wrkMast.setLinkMis("N");
+ wrkMast.setCtnNo("Y"); // 鍏ュ簱闃诲搴撲綅绉昏浆鏍囪
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ int res = wrkMastMapper.insert(wrkMast);
+ if (res == 0) {
+// throw new CoolException("");
+ log.error("4007绔欑偣锛屾《鍨�4锛屼繚瀛樺伐浣滄。涓绘。澶辫触锛侊紒锛侊紒锛侊紒"+now.toString());
+ continue;
+ }
+ type2 = 2;
+ } else if (inStn.getSourceStaNo() == 2102 && staProtocol.isFullPlt()) {
+ sta2 = Utils.getRgvStaNo(rgvSlave.getId(),2301);
+ } else {
+ sta2 = Utils.getRgvStaNo(rgvSlave.getId(),inStn.getStaNo());
+ }
+
+ if (inStn.getSourceStaNo() == 2102 && staProtocol.isEmptyMk()){ //鍖哄垎绌烘澘
+ type2 = 1;
+ }
+
+ if(inStn.getSourceStaNo() == 2102){
+ weight2 = staProtocol.getWeight().doubleValue()/10;
+ }
+ Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta2);
+ BasDevp devp2 = basDevpService.selectById(staNo);
+ if (devp2.getWrkNo()!=0 || Cools.isEmpty(devp2.getLoading()) || devp2.getLoading().equals("Y")){
+ continue;
+ }
+
+ work2 = true;
+ if (inStn.getSourcePlcId() == 4){
+ matnr2 = staProtocol.getMatnr();
+ batch2 = staProtocol.getBatch();
+ anfme2 = Cools.isEmpty(staProtocol.getAnfme2()) ? anfme2:staProtocol.getAnfme2().shortValue();
+ weight11 = staProtocol.getWeight1();
+ weight2 = weight11;
+ String memoBool = staProtocol.isBan()? "瀛樺湪":"涓嶅瓨鍦�";
+ memo2 = memoBool+"鍗婃《";
+ }
+ devpThread.setPakMk(inStn.getSourceStaNo(),false);
+ break;
+ }
}
@@ -2607,6 +3076,9 @@
command.setType(type);
command.setType2(type2);
+ command.setWeight(weight);
+ command.setWeight2(weight2);
+
if (workNo1 == 0 && workNo2 !=0){
command.setTaskMode(RgvTaskModeType.FETCH_PUT2); // 浠诲姟妯″紡: 2鍙栨斁璐�
} else if (workNo1 != 0 && workNo2 ==0) {
@@ -2615,15 +3087,11 @@
command.setTaskMode(RgvTaskModeType.FETCH_PUT_ALL); // 浠诲姟妯″紡: all鍙栨斁璐�
}
command.setCommand(false);
- rgvTaskSave(command);
+ rgvTaskSave(command,memo,memo2);
MessageQueue.offer(SlaveType.Rgv, rgvSlave.getId(), new Task(2, command));
log.info("rgv浠诲姟涓嬪彂锛�"+JSON.toJSONString(command));
}
}
-
-
-
-
}
}
@@ -2646,16 +3114,42 @@
if (rgvProtocol.getModeType() == RgvModeType.AUTO && rgvProtocol.getStatusType() == RgvStatusType.WAITING && rgvProtocol.getLoaded1() == 0) {
try {
- Wrapper<WrkMastSta> wrkMastStaWrapper = new EntityWrapper<WrkMastSta>().eq("wrk_crn", rgvProtocol.getRgvNo()).eq("wrk_no", rgvProtocol.getTaskNo1());
- WrkMastSta wrkMastSta1 = wrkMastStaService.selectOne(wrkMastStaWrapper);
- if (Cools.isEmpty(wrkMastSta1)){
- log.error("瀹屾垚{}鍙疯溅宸ヤ綅涓�浠诲姟鏈壘鍒板搴攔gv浠诲姟,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo1());
- }else {
- if (wrkMastSta1.getWrkType() == 8 ){
- wrkMastSta1.setWrkSts(3);
- wrkMastStaService.update(wrkMastSta1,wrkMastStaWrapper);
+ boolean offer = MessageQueue.offer(SlaveType.Rgv, rgvSlave.getId(), new Task(3, new RgvCommand()));
+ log.info("{}鍙穜gv宸ヤ綅涓�宸ヤ綔瀹屾垚澶嶄綅,宸ヤ綔鍙�:{}",rgvSlave.getId(),rgvProtocol.getTaskNo1());
+ if (offer){
+ //瀹屾垚rgv浠诲姟
+ Wrapper<WrkMastSta> wrkMastStaWrapper = new EntityWrapper<WrkMastSta>().eq("wrk_crn", rgvSlave.getId()).eq("wrk_no", rgvProtocol.getTaskNo1());
+ WrkMastSta wrkMastSta1 = wrkMastStaService.selectOne(wrkMastStaWrapper);
+ if (Cools.isEmpty(wrkMastSta1)){
+ log.error("瀹屾垚{}鍙疯溅宸ヤ綅涓�浠诲姟鏈壘鍒板搴攔gv浠诲姟,{}",rgvSlave.getId(),rgvProtocol.getTaskNo1());
+ }else {
+ if (wrkMastSta1.getWrkType() == 8 ){
+ wrkMastSta1.setWrkSts(3);
+ wrkMastStaService.update(wrkMastSta1,wrkMastStaWrapper);
+ }
+ }
+
+ //瀹屾垚宸ヤ綔妗ｄ换鍔�
+ if (rgvSlave.getId() != 1){
+ WrkMast wrkMast = wrkMastService.selectByworkNo(rgvProtocol.getTaskNo1());
+ if (Cools.isEmpty(wrkMast)){
+ log.error("瀹屾垚{}鍙疯溅宸ヤ綅涓�浠诲姟鏈壘鍒板搴攔gv浠诲姟,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo1());
+ } else {
+ if (wrkMast.getIoType() == 110 || wrkMast.getIoType() == 101){
+ Date date = new Date();
+ wrkMast.setWrkSts(14L);
+ wrkMast.setModiTime(date);
+ wrkMastService.updateById(wrkMast);
+ } else if (wrkMast.getIoType()==199 && rgvSlave.getId()==3 && (wrkMast.getStaNo()==3007 || wrkMast.getStaNo()==3012)){
+ Date date = new Date();
+ wrkMast.setWrkSts(105L);
+ wrkMast.setModiTime(date);
+ wrkMastService.updateById(wrkMast);
+ }
+ }
}
}
+
}catch (Exception e){
log.error("瀹屾垚{}鍙疯溅宸ヤ綅涓�浠诲姟鍑洪敊!!!!!!!!!!!!!!!!,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo1());
@@ -2663,26 +3157,47 @@
}
- MessageQueue.offer(SlaveType.Rgv, rgvSlave.getId(), new Task(3,new RgvCommand()));
- log.info("{}鍙穜gv宸ヤ綅涓�宸ヤ綔瀹屾垚澶嶄綅,宸ヤ綔鍙�:{}",rgvSlave.getId(),rgvProtocol.getTaskNo1());
+
}
//宸ヤ綅浜屼换鍔″畬鎴�
if (rgvProtocol.getModeType() == RgvModeType.AUTO && rgvProtocol.getStatusType() == RgvStatusType.WAITING2 && rgvProtocol.getLoaded2() == 0) {
try {
- Wrapper<WrkMastSta> wrkMastStaWrapper = new EntityWrapper<WrkMastSta>().eq("wrk_crn", rgvProtocol.getRgvNo()).eq("wrk_no", rgvProtocol.getTaskNo2());
- WrkMastSta wrkMastSta1 = wrkMastStaService.selectOne(wrkMastStaWrapper);
- if (Cools.isEmpty(wrkMastSta1)){
- log.error("瀹屾垚{}鍙疯溅宸ヤ綅浜屼换鍔℃湭鎵惧埌瀵瑰簲宸ヤ綔浠诲姟,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo2());
- }else {
- if (wrkMastSta1.getWrkType() == 9 ){
- wrkMastSta1.setWrkSts(3);
- wrkMastStaService.update(wrkMastSta1,wrkMastStaWrapper);
- }else if (wrkMastSta1.getWrkType() == 1){
- wrkMastSta1.setWrkSts(3);
- wrkMastStaService.update(wrkMastSta1,wrkMastStaWrapper);
+ boolean offer = MessageQueue.offer(SlaveType.Rgv, rgvSlave.getId(), new Task(4, new RgvCommand()));
+ log.info("{}鍙穜gv宸ヤ綅浜屽伐浣滃畬鎴愬浣�,宸ヤ綔鍙�:{}",rgvSlave.getId(),rgvProtocol.getTaskNo2());
+ if (offer){
+ //瀹屾垚rgv浠诲姟
+ Wrapper<WrkMastSta> wrkMastStaWrapper = new EntityWrapper<WrkMastSta>().eq("wrk_crn", rgvProtocol.getRgvNo()).eq("wrk_no2", rgvProtocol.getTaskNo2());
+ WrkMastSta wrkMastSta1 = wrkMastStaService.selectOne(wrkMastStaWrapper);
+ if (Cools.isEmpty(wrkMastSta1)){
+ log.error("瀹屾垚{}鍙疯溅宸ヤ綅浜屼换鍔℃湭鎵惧埌瀵瑰簲宸ヤ綔浠诲姟,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo2());
+ }else {
+ if (wrkMastSta1.getWrkType() == 9 ){
+ wrkMastSta1.setWrkSts(3);
+ wrkMastStaService.update(wrkMastSta1,wrkMastStaWrapper);
+ }else if (wrkMastSta1.getWrkType() == 1){
+ wrkMastSta1.setWrkSts(3);
+ wrkMastStaService.update(wrkMastSta1,wrkMastStaWrapper);
+ }
}
+
+ //瀹屾垚宸ヤ綔妗ｄ换鍔�
+ if (rgvSlave.getId() != 1){
+ WrkMast wrkMast = wrkMastService.selectByworkNo(rgvProtocol.getTaskNo2());
+ if (Cools.isEmpty(wrkMast)){
+ log.error("瀹屾垚{}鍙疯溅宸ヤ綅涓�浠诲姟鏈壘鍒板搴攔gv浠诲姟,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo2());
+ }else {
+ if (wrkMast.getIoType() == 110 || wrkMast.getIoType() == 101){
+ Date date = new Date();
+ wrkMast.setWrkSts(14L);
+ wrkMast.setModiTime(date);
+ wrkMastService.updateById(wrkMast);
+ }
+ }
+ }
+
}
+
}catch (Exception e){
log.error("瀹屾垚{}鍙疯溅宸ヤ綅涓�浠诲姟鍑洪敊!!!!!!!!!!!!!!!!,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo1());
continue;
@@ -2690,8 +3205,7 @@
- MessageQueue.offer(SlaveType.Rgv, rgvSlave.getId(), new Task(4,new RgvCommand()));
- log.info("{}鍙穜gv宸ヤ綅浜屽伐浣滃畬鎴愬浣�,宸ヤ綔鍙�:{}",rgvSlave.getId(),rgvProtocol.getTaskNo2());
+
}
}
}
@@ -2712,10 +3226,10 @@
//宸ヤ綅涓�浠诲姟瀹屾垚
if (rgvProtocol.getModeType() == RgvModeType.AUTO && rgvProtocol.getStatusType() == RgvStatusType.OUTSTN1 && rgvProtocol.getLoaded1() == 1) {
- WrkMastSta wrkMastSta = wrkMastStaService.selectByRgvNoandWrkNo(rgvProtocol.getRgvNo(), rgvProtocol.getTaskNo1());
+ WrkMastSta wrkMastSta = wrkMastStaService.selectByRgvNoandWrkNo(rgvSlave.getId(), rgvProtocol.getTaskNo1());
WrkMast wrkMast = wrkMastService.selectByworkNo(rgvProtocol.getTaskNo1());
if (Cools.isEmpty(wrkMastSta)){
- log.error("鏈煡璇㈠埌rgv宸ヤ綔浠诲姟锛宺gv缂栧彿{},宸ヤ綔鍙穥}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo1());
+ log.error("鏈煡璇㈠埌rgv宸ヤ綔浠诲姟锛宺gv缂栧彿{},宸ヤ綔鍙穥}",rgvSlave.getId(),rgvProtocol.getTaskNo1());
continue;
}
for (RgvSlave.Sta outStn :rgvSlave.getOutStn()){
@@ -2731,7 +3245,12 @@
}
if (staProtocol.isAutoing() && !staProtocol.isLoading() && staProtocol.isPakMk()){
staProtocol.setWorkNo(wrkMastSta.getWrkNo().shortValue());
- staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
+ if (rgvSlave.getId() == 3 && outStn.getStaPlcId() == 6){
+ staProtocol.setStaNo((short)2401);
+ }else {
+ staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
+ }
+
MessageQueue.offer(SlaveType.Devp, outStn.getStaPlcId(), new Task(2, staProtocol));
}
}
@@ -2739,16 +3258,16 @@
//宸ヤ綅浜屼换鍔″畬鎴�
if (rgvProtocol.getModeType() == RgvModeType.AUTO && rgvProtocol.getStatusType() == RgvStatusType.OUTSTN8 && rgvProtocol.getLoaded2() == 1) {
- WrkMastSta wrkMastSta = wrkMastStaService.selectByRgvNoandWrkNo(rgvProtocol.getRgvNo(), rgvProtocol.getTaskNo2());
+ WrkMastSta wrkMastSta = wrkMastStaService.selectByRgvNoandWrkNo2(rgvProtocol.getRgvNo(), rgvProtocol.getTaskNo2());
WrkMast wrkMast = wrkMastService.selectByworkNo(rgvProtocol.getTaskNo2());
if (Cools.isEmpty(wrkMastSta)){
log.error("鏈煡璇㈠埌rgv宸ヤ綔浠诲姟锛宺gv缂栧彿{},宸ヤ綔鍙穥}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo2());
continue;
}
for (RgvSlave.Sta outStn :rgvSlave.getOutStn()){
- if (wrkMastSta.getStaEnd() != outStn.getStaNo()){
+ if (!Objects.equals(Utils.getStaNo(rgvSlave.getId(), wrkMastSta.getStaEnd()), outStn.getStaNo())){
continue;
- }
+ }//鍒ゆ柇鏄惁涓哄伐浣滄。绔欑偣
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, outStn.getStaPlcId());
StaProtocol staProtocol = devpThread.getStation().get(outStn.getStaNo());
if (staProtocol == null) {
@@ -2788,6 +3307,9 @@
continue;
}
for (RgvSlave.Sta outStn :rgvSlave.getOutStn()){
+ if (!Objects.equals(Utils.getStaNo(rgvSlave.getId(), wrkMastSta.getWrkEnd()), outStn.getStaNo())){
+ continue;
+ }
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, outStn.getStaPlcId());
StaProtocol staProtocol = devpThread.getStation().get(outStn.getStaNo());
if (staProtocol == null) {
@@ -2801,7 +3323,9 @@
staProtocol.setWorkNo(wrkMastSta.getWrkNo().shortValue());
if (wrkMastSta.getType() == 1){
staProtocol.setStaNo((short) 9999);
- }else {
+ } else if (wrkMastSta.getType() == 2){//杞繍
+ staProtocol.setStaNo((short) 2114);
+ } else {
staProtocol.setStaNo((short) 2106);
}
staProtocol.setMatnr(wrkMastSta.getMatnr1());
@@ -2823,6 +3347,9 @@
continue;
}
for (RgvSlave.Sta outStn :rgvSlave.getOutStn()){
+ if (!Objects.equals(Utils.getStaNo(rgvSlave.getId(), wrkMastSta.getStaEnd()), outStn.getStaNo())){
+ continue;
+ }
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, outStn.getStaPlcId());
StaProtocol staProtocol = devpThread.getStation().get(outStn.getStaNo());
if (staProtocol == null) {
@@ -2835,7 +3362,9 @@
staProtocol.setWorkNo(wrkMastSta.getWrkNo2().shortValue());
if (wrkMastSta.getType2() == 1){
staProtocol.setStaNo((short) 9999);
- }else {
+ } else if (wrkMastSta.getType() == 2){//杞繍
+ staProtocol.setStaNo((short) 2114);
+ } else {
staProtocol.setStaNo((short) 2106);
}
@@ -2868,16 +3397,42 @@
if (rgvProtocol.getModeType() == RgvModeType.AUTO && rgvProtocol.getStatusType() == RgvStatusType.WAITING && rgvProtocol.getLoaded1() == 0) {
try {
- Wrapper<WrkMastSta> wrkMastStaWrapper = new EntityWrapper<WrkMastSta>().eq("wrk_crn", rgvProtocol.getRgvNo()).eq("wrk_no", rgvProtocol.getTaskNo1());
- WrkMastSta wrkMastSta1 = wrkMastStaService.selectOne(wrkMastStaWrapper);
- if (Cools.isEmpty(wrkMastSta1)){
- log.error("瀹屾垚{}鍙疯溅宸ヤ綅涓�浠诲姟鏈壘鍒板搴攔gv浠诲姟,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo1());
- }else {
- if (wrkMastSta1.getWrkType() == 8 ){
- wrkMastSta1.setWrkSts(3);
- wrkMastStaService.update(wrkMastSta1,wrkMastStaWrapper);
+ boolean offer = MessageQueue.offer(SlaveType.Rgv, rgvSlave.getId(), new Task(3, new RgvCommand()));
+ log.info("{}鍙穜gv宸ヤ綅涓�宸ヤ綔瀹屾垚澶嶄綅,宸ヤ綔鍙�:{}",rgvSlave.getId(),rgvProtocol.getTaskNo1());
+ if (offer){
+
+ Wrapper<WrkMastSta> wrkMastStaWrapper = new EntityWrapper<WrkMastSta>().eq("wrk_crn", rgvProtocol.getRgvNo()).eq("wrk_no", rgvProtocol.getTaskNo1());
+ WrkMastSta wrkMastSta1 = wrkMastStaService.selectOne(wrkMastStaWrapper);
+ if (Cools.isEmpty(wrkMastSta1)){
+ log.error("瀹屾垚{}鍙疯溅宸ヤ綅涓�浠诲姟鏈壘鍒板搴攔gv浠诲姟,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo1());
+ }else {
+ if (wrkMastSta1.getWrkType() == 8 ){
+ wrkMastSta1.setWrkSts(3);
+ wrkMastStaService.update(wrkMastSta1,wrkMastStaWrapper);
+ }
}
+
+ //瀹屾垚宸ヤ綔妗ｄ换鍔�
+ WrkMast wrkMast = wrkMastService.selectByworkNo(rgvProtocol.getTaskNo1());
+ if (Cools.isEmpty(wrkMast)){
+ log.error("瀹屾垚{}鍙疯溅宸ヤ綅涓�浠诲姟鏈壘鍒板搴攔gv浠诲姟,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo1());
+ }else {
+ if (wrkMast.getIoType() == 110 || wrkMast.getIoType() == 101){
+ Date date = new Date();
+ wrkMast.setWrkSts(14L);
+ wrkMast.setModiTime(date);
+ wrkMastService.updateById(wrkMast);
+ } else if (wrkMast.getIoType()==199 && wrkMast.getStaNo()==2001){
+ Date date = new Date();
+ wrkMast.setWrkSts(105L);
+ wrkMast.setModiTime(date);
+ wrkMastService.updateById(wrkMast);
+ }
+ }
+
+
}
+
}catch (Exception e){
log.error("瀹屾垚{}鍙疯溅宸ヤ綅涓�浠诲姟鍑洪敊!!!!!!!!!!!!!!!!,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo1());
@@ -2885,26 +3440,44 @@
}
- MessageQueue.offer(SlaveType.Rgv, rgvSlave.getId(), new Task(3,new RgvCommand()));
- log.info("{}鍙穜gv宸ヤ綅涓�宸ヤ綔瀹屾垚澶嶄綅,宸ヤ綔鍙�:{}",rgvSlave.getId(),rgvProtocol.getTaskNo1());
+
}
//宸ヤ綅浜屼换鍔″畬鎴�
if (rgvProtocol.getModeType() == RgvModeType.AUTO && rgvProtocol.getStatusType() == RgvStatusType.WAITING2 && rgvProtocol.getLoaded2() == 0) {
try {
- Wrapper<WrkMastSta> wrkMastStaWrapper = new EntityWrapper<WrkMastSta>().eq("wrk_crn", rgvProtocol.getRgvNo()).eq("wrk_no", rgvProtocol.getTaskNo2());
- WrkMastSta wrkMastSta1 = wrkMastStaService.selectOne(wrkMastStaWrapper);
- if (Cools.isEmpty(wrkMastSta1)){
- log.error("瀹屾垚{}鍙疯溅宸ヤ綅浜屼换鍔℃湭鎵惧埌瀵瑰簲宸ヤ綔浠诲姟,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo2());
- }else {
- if (wrkMastSta1.getWrkType() == 9 ){
- wrkMastSta1.setWrkSts(3);
- wrkMastStaService.update(wrkMastSta1,wrkMastStaWrapper);
- }else if (wrkMastSta1.getWrkType() == 1){
- wrkMastSta1.setWrkSts(3);
- wrkMastStaService.update(wrkMastSta1,wrkMastStaWrapper);
+ boolean offer = MessageQueue.offer(SlaveType.Rgv, rgvSlave.getId(), new Task(4, new RgvCommand()));
+ log.info("{}鍙穜gv宸ヤ綅浜屽伐浣滃畬鎴愬浣�,宸ヤ綔鍙�:{}",rgvSlave.getId(),rgvProtocol.getTaskNo2());
+ if (offer){
+ Wrapper<WrkMastSta> wrkMastStaWrapper = new EntityWrapper<WrkMastSta>().eq("wrk_crn", rgvProtocol.getRgvNo()).eq("wrk_no2", rgvProtocol.getTaskNo2());
+ WrkMastSta wrkMastSta1 = wrkMastStaService.selectOne(wrkMastStaWrapper);
+ if (Cools.isEmpty(wrkMastSta1)){
+ log.error("瀹屾垚{}鍙疯溅宸ヤ綅浜屼换鍔℃湭鎵惧埌瀵瑰簲宸ヤ綔浠诲姟,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo2());
+ }else {
+ if (wrkMastSta1.getWrkType() == 9 ){
+ wrkMastSta1.setWrkSts(3);
+ wrkMastStaService.update(wrkMastSta1,wrkMastStaWrapper);
+ }else if (wrkMastSta1.getWrkType() == 1){
+ wrkMastSta1.setWrkSts(3);
+ wrkMastStaService.update(wrkMastSta1,wrkMastStaWrapper);
+ }
}
+
+ //瀹屾垚宸ヤ綔妗ｄ换鍔�
+ WrkMast wrkMast = wrkMastService.selectByworkNo(rgvProtocol.getTaskNo2());
+ if (Cools.isEmpty(wrkMast)){
+ log.error("瀹屾垚{}鍙疯溅宸ヤ綅涓�浠诲姟鏈壘鍒板搴攔gv浠诲姟,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo2());
+ }else {
+ if (wrkMast.getIoType() == 110 || wrkMast.getIoType() == 101){
+ Date date = new Date();
+ wrkMast.setWrkSts(14L);
+ wrkMast.setModiTime(date);
+ wrkMastService.updateById(wrkMast);
+ }
+ }
+
}
+
}catch (Exception e){
log.error("瀹屾垚{}鍙疯溅宸ヤ綅涓�浠诲姟鍑洪敊!!!!!!!!!!!!!!!!,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo1());
@@ -2913,18 +3486,33 @@
- MessageQueue.offer(SlaveType.Rgv, rgvSlave.getId(), new Task(4,new RgvCommand()));
- log.info("{}鍙穜gv宸ヤ綅浜屽伐浣滃畬鎴愬浣�,宸ヤ綔鍙�:{}",rgvSlave.getId(),rgvProtocol.getTaskNo2());
+
}
}
}
- public boolean rgvTaskSave(RgvCommand command){
- Wrapper<WrkMastSta> wrkMastStaWrapper = new EntityWrapper<WrkMastSta>().eq("wrk_crn", command.getRgvNo()).eq("wrk_no", command.getTaskNo1());
- WrkMastSta wrkMastSta1 = wrkMastStaService.selectOne(wrkMastStaWrapper);
- if (!Cools.isEmpty(wrkMastSta1)){
- wrkMastStaService.delete(wrkMastStaWrapper);
+ public boolean rgvTaskSave(RgvCommand command,String memo,String memo2){
+// Wrapper<WrkMastSta> wrkMastStaWrapper = new EntityWrapper<WrkMastSta>().eq("wrk_crn", command.getRgvNo()).eq("wrk_no", command.getTaskNo1());
+ if (command.getTaskNo1() > 0){
+ List<WrkMastSta> wrkMastSta1 = wrkMastStaService.selectBywrkNoHistoricalTasks(command.getRgvNo(),command.getTaskNo1());
+ if (!Cools.isEmpty(wrkMastSta1)){
+ for (WrkMastSta wrkMastSta :wrkMastSta1){
+ wrkMastStaService.deleteById(wrkMastSta);
+ }
+
+ }
}
+ if (command.getTaskNo2() > 0){
+ List<WrkMastSta> wrkMastSta1 = wrkMastStaService.selectBywrkNoHistoricalTasks2(command.getRgvNo(),command.getTaskNo2());
+ if (!Cools.isEmpty(wrkMastSta1)){
+ for (WrkMastSta wrkMastSta :wrkMastSta1){
+ wrkMastStaService.deleteById(wrkMastSta);
+ }
+
+ }
+ }
+
+
WrkMastSta wrkMastSta = new WrkMastSta();
wrkMastSta.setWrkNo(Long.valueOf(command.getTaskNo1()));
wrkMastSta.setWrkNo2(Long.valueOf(command.getTaskNo2()));
@@ -2938,14 +3526,19 @@
wrkMastSta.setUpdateTime(now);
wrkMastSta.setWrkCrn(command.getRgvNo());
wrkMastSta.setWrkType(command.getTaskMode().intValue());
- wrkMastSta.setMatnr1(command.getMatnr().intValue());
- wrkMastSta.setMatnr2(command.getMatnr2().intValue());
+ wrkMastSta.setMatnr1(command.getMatnr());
+ wrkMastSta.setMatnr2(command.getMatnr2());
wrkMastSta.setType(command.getType().intValue());
wrkMastSta.setType2(command.getType2().intValue());
wrkMastSta.setBatch(command.getBatch());
wrkMastSta.setBatch2(command.getBatch2());
wrkMastSta.setAnfme(command.getAnfme().intValue());
wrkMastSta.setAnfme2(command.getAnfme2().intValue());
+ wrkMastSta.setWeight(command.getWeight());
+ wrkMastSta.setWeight2(command.getWeight2());
+ wrkMastSta.setMemo(memo);
+ wrkMastSta.setMemo2(memo2);
+
return wrkMastStaService.insert(wrkMastSta);
}
@@ -3015,14 +3608,26 @@
}
}
// 鑾峰彇鍏ュ簱閫氱煡妗�
- List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
- if (waitPakins.isEmpty()) {
+ WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
+ if (Cools.isEmpty(waitPakin)) {
try {
- CreateComb(barcode,staProtocol.getMatnr().intValue(),staProtocol.getWorkNo().intValue());
+ CreateComb(barcode, staProtocol.getMatnr(),staProtocol.getWorkNo().intValue(),staProtocol.getBatch(),inSta);
}catch (IOException e) {
throw new CoolException(e);
}
- }else {
+ } 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("鏈壘鍒板搴旂殑浠诲姟淇℃伅");
+ }
+ waitPakin.setWeight(wrkMastSta.getWeight2());
+ }else {
+ waitPakin.setWeight(wrkMastSta.getWeight());
+ }
+ waitPakinService.update(waitPakin,new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
+ } else {
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
SearchLocParam param = new SearchLocParam();
@@ -3076,23 +3681,33 @@
}
- public void CreateComb(String barcode,Integer code,Integer wrkNo) throws IOException {
- String batch = "";
- Double anfme = 0D;
+ public void CreateComb(String barcode,Integer code,Integer wrkNo,String batch,DevpSlave.Sta inSta) throws IOException {
+ Double anfme = 0d;
+ Double weight = 0d;
+ String memo = "";
WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkNo));
if (Cools.isEmpty(wrkMastSta)){
wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no2", wrkNo));
if (Cools.isEmpty(wrkMastSta)){
- throw new CoolException("鏈壘鍒板搴旂殑浠诲姟淇℃伅");
+ if (code >0 && !Cools.isEmpty(batch)){
+ anfme = 1d;
+ }else {
+ throw new CoolException("鏈壘鍒板搴旂殑浠诲姟淇℃伅");
+ }
+ }else {
+ batch = wrkMastSta.getBatch2();
+ anfme = wrkMastSta.getAnfme2().doubleValue();
+ code = wrkMastSta.getMatnr2();
+ weight = wrkMastSta.getWeight2();
+ memo = wrkMastSta.getMemo2();
}
- batch = wrkMastSta.getBatch2();
- anfme = wrkMastSta.getAnfme2().doubleValue();
- code = wrkMastSta.getMatnr2();
}else {
batch = wrkMastSta.getBatch();
anfme = wrkMastSta.getAnfme().doubleValue();
code = wrkMastSta.getMatnr1();
+ weight = wrkMastSta.getWeight();
+ memo = wrkMastSta.getMemo();
}
MatnrCode matnrCode = matnrCodeService.selectByCode(code);
if (Cools.isEmpty(matnrCode)){
@@ -3105,6 +3720,8 @@
combMat.setMatnr(matnrCode.getMatnr());
combMat.setBatch(batch);
combMat.setAnfme(anfme);
+ combMat.setWeight(weight);
+ combMat.setMemo(memo);
combMats.add(combMat);
combParam.setCombMats(combMats);
@@ -3118,6 +3735,11 @@
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
+ }else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/mobile/comb/auth", JSON.toJSONString(combParam), response);
+// log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
+ //鏉＄爜涓虹┖鎴栬�呬笉绗﹀悎锛岄��搴撲俊鍙蜂笅鍙�
+ boolean result = MessageQueue.offer(SlaveType.Devp, 2, new Task(3, null));
}
}
--
Gitblit v1.9.1