From 30f45550c8d54eedac210349f9bec5411662739a Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 23 十二月 2025 11:05:59 +0800
Subject: [PATCH] #移库事务回滚修改
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 384 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 280 insertions(+), 104 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 08a9a18..a0ba060 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;
@@ -1637,69 +1639,71 @@
if (null == loc) {
log.error("鍙屾繁搴撲綅 --- 娴呭簱浣嶉樆濉炲紓甯革紒 寰呯Щ杞祬搴撲綅锛�" + shallowLoc.getLocNo());
- throw new CoolException("鍙屾繁搴撲綅 --- 娴呭簱浣嶉樆濉炲紓甯革紒 寰呯Щ杞祬搴撲綅锛�" + shallowLoc.getLocNo());
- }
- // 鑾峰彇宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(0);
- // 淇濆瓨宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(new Date());
- wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
- wrkMast.setIoPri(13D);
- wrkMast.setCrnNo(crn.getId());
- wrkMast.setSourceLocNo(shallowLoc.getLocNo()); // 婧愬簱浣�
- wrkMast.setLocNo(loc.getLocNo()); // 鐩爣搴撲綅
- wrkMast.setFullPlt(shallowLoc.getFullPlt()); // 婊℃澘
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("D") ? "Y" : "N"); // 绌烘澘
- wrkMast.setBarcode(shallowLoc.getBarcode()); // 鎵樼洏鐮�
- wrkMast.setLinkMis("N");
- wrkMast.setAppeTime(new Date());
- wrkMast.setModiTime(new Date());
- int res = wrkMastMapper.insert(wrkMast);
- if (res == 0) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- // 宸ヤ綔妗ｆ槑缁嗕繚瀛�
- 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);
- wrkDetl.setIoTime(new Date());
- wrkDetl.setAnfme(locDetl.getAnfme());
- VersionUtils.setWrkDetl(wrkDetl, locDetl); // 鐗堟湰鎺у埗
- wrkDetl.setAppeTime(new Date());
- wrkDetl.setModiTime(new Date());
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }else {
+ // 鑾峰彇宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(0);
+ // 淇濆瓨宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
+ wrkMast.setIoPri(13D);
+ wrkMast.setCrnNo(crn.getId());
+ wrkMast.setSourceLocNo(shallowLoc.getLocNo()); // 婧愬簱浣�
+ wrkMast.setLocNo(loc.getLocNo()); // 鐩爣搴撲綅
+ wrkMast.setFullPlt(shallowLoc.getLocSts().equals("F") ? "Y" : "N"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("D") ? "Y" : "N"); // 绌烘澘
+ wrkMast.setBarcode(shallowLoc.getBarcode()); // 鎵樼洏鐮�
+ wrkMast.setLinkMis("N");
+ wrkMast.setAppeTime(new Date());
+ wrkMast.setModiTime(new Date());
+ int res = wrkMastMapper.insert(wrkMast);
+ if (res == 0) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 宸ヤ綔妗ｆ槑缁嗕繚瀛�
+ 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);
+ wrkDetl.setIoTime(new Date());
+ wrkDetl.setAnfme(locDetl.getAnfme());
+ VersionUtils.setWrkDetl(wrkDetl, locDetl); // 鐗堟湰鎺у埗
+ wrkDetl.setAppeTime(new Date());
+ wrkDetl.setModiTime(new Date());
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
}
}
- }
- // 淇敼婧愬簱浣嶇姸鎬�
- if (shallowLoc.getLocSts().equals("D") || shallowLoc.getLocSts().equals("F")) {
- shallowLoc.setLocSts("R"); // R.鍑哄簱棰勭害
- shallowLoc.setModiTime(new Date());
- if (!locMastService.updateById(shallowLoc)) {
- throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
+ // 淇敼婧愬簱浣嶇姸鎬�
+ if (shallowLoc.getLocSts().equals("D") || shallowLoc.getLocSts().equals("F")) {
+ shallowLoc.setLocSts("R"); // R.鍑哄簱棰勭害
+ shallowLoc.setModiTime(new Date());
+ if (!locMastService.updateById(shallowLoc)) {
+ throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
+ }
+ } else {
+ throw new CoolException("婧愬簱浣嶅嚭搴撳け璐�");
}
- } else {
- throw new CoolException("婧愬簱浣嶅嚭搴撳け璐�");
- }
- // 淇敼鐩爣搴撲綅鐘舵��
- if (loc.getLocSts().equals("O")) {
- loc.setLocSts("S"); // S.鍏ュ簱棰勭害
- loc.setModiTime(new Date());
- if (!locMastService.updateById(loc)) {
- throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
+ // 淇敼鐩爣搴撲綅鐘舵��
+ if (loc.getLocSts().equals("O")) {
+ loc.setLocSts("S"); // S.鍏ュ簱棰勭害
+ loc.setModiTime(new Date());
+ if (!locMastService.updateById(loc)) {
+ throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException("绉昏浆澶辫触");
}
- } else {
- throw new CoolException("绉昏浆澶辫触");
}
+
+
} catch (Exception e) {
log.error("鍙屾繁搴撲綅闃诲锛屽娴呭簱浣嶈繘琛岀Щ杞け璐�", e);
e.printStackTrace();
@@ -2065,10 +2069,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 +2084,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 +2154,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 +2175,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)
@@ -2188,9 +2205,6 @@
public synchronized void crn5InTask(){
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- if (crnSlave.getId() != 5){
- continue;
- }
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
@@ -2231,7 +2245,7 @@
}
}
-
+ this.locToLoc(crnSlave, crnProtocol);
}
}
public void Crn5InTaskSta(CrnSlave slave, CrnProtocol crnProtocol){
@@ -2255,6 +2269,10 @@
if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
return;
}
+ // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+ if (wrkMastMapper.selectWorking(slave.getId()) != null) {
+ continue;
+ }
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
@@ -2265,10 +2283,10 @@
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()); // 璐х墿绫诲瀷
+ crnCommand.setLocType1(locMast.getLocType1()); // 璐х墿绫诲瀷
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
@@ -2291,9 +2309,6 @@
public synchronized void crn5StnToOutStn() {
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- if (crnSlave.getId() != 5){
- continue;
- }
// 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
// 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
@@ -2397,6 +2412,55 @@
break;
}
+ // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
+ if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
+ log.warn(" - 2"+" - 6"+" - 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞� : 寮�濮嬫墽琛� 浠诲姟鍙�={}",wrkMast.getWrkNo());
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
+ LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒
+ if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
+ log.warn(" - 2"+" - 7"+" - // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒搴撲綅鐘舵��={}",shallowLoc.getLocSts());
+ WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(shallowLocNo);
+ if (null == waitWrkMast) {
+ News.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
+ } else {
+ if (waitWrkMast.getWrkSts() == 11) {
+ waitWrkMast.setIoPri(15D);
+ waitWrkMast.setModiTime(new Date());
+ if (wrkMastMapper.updateById(waitWrkMast) == 0) {
+ News.error(" - 2"+" - 8"+" - 璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
+ }
+ continue;
+ } else {
+
+ }
+ }
+ } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
+ log.warn(" - 2"+" - 9"+" - // F銆丏 搴撲綅鐘舵��={}",shallowLoc.getLocSts());
+// WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
+ //2022-08-16 modify,涓嶆牴鎹畊pdmk鏍囪绉诲簱浠诲姟(瀹规槗琚彇娑堝鑷村牭濉�)锛屾煡璇㈠伐浣滄。鏄惁瀛樺湪浠诲姟
+ WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(shallowLocNo);
+ // 姝ゆ爣璁伴伩鍏嶅娆℃墽琛岀Щ搴撲换鍔�
+// if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())
+// || Cools.isEmpty(waitWrkMast)) {
+ if (Cools.isEmpty(waitWrkMast)) {
+ wrkMast.setUpdMk("Y");
+ wrkMastMapper.updateById(wrkMast);
+ // 鐢熸垚宸ヤ綔妗�,灏嗘祬搴撲綅绉昏浆鍒版柊鐨勫簱浣嶄腑
+ moveLocForDeepLoc(slave, shallowLoc);
+ }
+ News.error("{}浠诲姟鍑哄簱澶辫触锛屾祬搴撲綅鍫靛锛佹祬搴撲綅鍙�:{}", wrkMast.getWrkNo(), shallowLocNo);
+ continue;
+ } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")) {
+ log.warn(" - 2"+" - 10"+" - // Q銆丼 搴撲綅鐘舵��={}",shallowLoc.getLocSts());
+ WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(shallowLocNo);
+ if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
+ log.warn(" - 2"+" - 11"+" - // F銆丏 宸ヤ綔鐘舵��(鍒ゆ柇鏉′欢涓�==4)={}",waitWrkMast.getWrkSts());
+ continue;
+ }
+ }
+ }
+
// 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
if (wrkMastMapper.selectWorking(slave.getId()) != null) {
@@ -2410,13 +2474,13 @@
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()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
- crnCommand.setLocType1(locMast.getLocType1().shortValue()); // 璐х墿绫诲瀷
+ crnCommand.setLocType1(locMast.getLocType1()); // 璐х墿绫诲瀷
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
@@ -2437,9 +2501,6 @@
public synchronized void crn5TaskCreate() throws IOException {
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- if (crnSlave.getId() != 5){
- continue;
- }
for (CrnSlave.CrnStn crnStn : crnSlave.getCrnInStn()) {
// 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
@@ -2466,7 +2527,7 @@
log.info("绌烘《寮哄埗鍏ュ簱锛�"+staProtocol.getAmount());
matCodeStore.setAnfme(Double.valueOf(staProtocol.getAmount()));
}else {
- matCodeStore.setAnfme(8d) ;
+ matCodeStore.setAnfme(4d) ;
}
ArrayList<FullStoreParam.MatCodeStore> matCodeStores = new ArrayList<>();
matCodeStores.add(matCodeStore);
@@ -2501,6 +2562,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;
@@ -2518,6 +2583,8 @@
short type2 = 0;
short anfme = 0;
short anfme2 = 0;
+ Double weight = 0d;
+ Double weight2 = 0d;
//宸ヤ綅涓�浠诲姟
for (RgvSlave.Sta inStn : rgvSlave.getInStn()){
@@ -2527,12 +2594,12 @@
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)){
@@ -2547,6 +2614,36 @@
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() == 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;
+ }
+
+ work1 = true;
+ if (inStn.getSourcePlcId() == 4 || inStn.getSourcePlcId() ==5){ //鐏岃绔欓渶瑕佽幏鍙栬緭閫佺嚎鐗╂枡浠ｇ爜
+ matnr = staProtocol.getMatnr();
+ }
+
+ devpThread.setPakMk(inStn.getSourceStaNo(),false);
+ break;
}
}
@@ -2562,12 +2659,12 @@
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)){
@@ -2580,7 +2677,37 @@
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() == 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;
+ }
+
+ work2 = true;
+ if (inStn.getSourcePlcId() == 4){
+ matnr2 = staProtocol.getMatnr();
+ }
+ devpThread.setPakMk(inStn.getSourceStaNo(),false);
+ break;
+ }
}
@@ -2612,6 +2739,9 @@
command.setType(type);
command.setType2(type2);
+
+ command.setWeight(weight);
+ command.setWeight2(weight2);
if (workNo1 == 0 && workNo2 !=0){
command.setTaskMode(RgvTaskModeType.FETCH_PUT2); // 浠诲姟妯″紡: 2鍙栨斁璐�
@@ -2656,10 +2786,10 @@
log.info("{}鍙穜gv宸ヤ綅涓�宸ヤ綔瀹屾垚澶嶄綅,宸ヤ綔鍙�:{}",rgvSlave.getId(),rgvProtocol.getTaskNo1());
if (offer){
//瀹屾垚rgv浠诲姟
- Wrapper<WrkMastSta> wrkMastStaWrapper = new EntityWrapper<WrkMastSta>().eq("wrk_crn", rgvProtocol.getRgvNo()).eq("wrk_no", rgvProtocol.getTaskNo1());
+ 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浠诲姟,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo1());
+ log.error("瀹屾垚{}鍙疯溅宸ヤ綅涓�浠诲姟鏈壘鍒板搴攔gv浠诲姟,{}",rgvSlave.getId(),rgvProtocol.getTaskNo1());
}else {
if (wrkMastSta1.getWrkType() == 8 ){
wrkMastSta1.setWrkSts(3);
@@ -2762,7 +2892,7 @@
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()){
@@ -2840,6 +2970,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) {
@@ -2875,6 +3008,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) {
@@ -2967,7 +3103,7 @@
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_no", rgvProtocol.getTaskNo2());
+ 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());
@@ -3011,10 +3147,26 @@
public boolean rgvTaskSave(RgvCommand command){
// Wrapper<WrkMastSta> wrkMastStaWrapper = new EntityWrapper<WrkMastSta>().eq("wrk_crn", command.getRgvNo()).eq("wrk_no", command.getTaskNo1());
- List<WrkMastSta> wrkMastSta1 = wrkMastStaService.selectBywrkNoHistoricalTasks(command.getRgvNo(),command.getTaskNo1(),command.getTaskNo2());
- if (!Cools.isEmpty(wrkMastSta1)){
- wrkMastStaService.deleteBatchIds(wrkMastSta1);
+ 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()));
@@ -3028,14 +3180,17 @@
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());
+
return wrkMastStaService.insert(wrkMastSta);
}
@@ -3105,14 +3260,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());
}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();
@@ -3166,23 +3333,30 @@
}
- 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) throws IOException {
+ Double anfme = 0d;
+ Double weight = 0d;
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();
}
- batch = wrkMastSta.getBatch2();
- anfme = wrkMastSta.getAnfme2().doubleValue();
- code = wrkMastSta.getMatnr2();
}else {
batch = wrkMastSta.getBatch();
anfme = wrkMastSta.getAnfme().doubleValue();
code = wrkMastSta.getMatnr1();
+ weight = wrkMastSta.getWeight();
}
MatnrCode matnrCode = matnrCodeService.selectByCode(code);
if (Cools.isEmpty(matnrCode)){
@@ -3208,6 +3382,8 @@
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);
}
}
--
Gitblit v1.9.1