From 8ba4ddfed043b20b0a15316141a9be10162ba664 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 12 十二月 2022 12:17:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs_tqs' into bfwcs_tqs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 149 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 109 insertions(+), 40 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 9e28c38..f397953 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -63,6 +63,8 @@
@Autowired
private WrkMastMapper wrkMastMapper;
@Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
private WrkDetlService wrkDetlService;
@Autowired
private LocMastService locMastService;
@@ -95,8 +97,7 @@
* 缁勬墭
* 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗ｏ紝宸ヤ綔鐘舵�� 2
*/
- @Async
- public void generateStoreWrkFile() {
+ public synchronized void generateStoreWrkFile() {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鍏ュ簱鍙�
@@ -228,8 +229,7 @@
* wms鍏ュ簱
* 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗ｏ紝宸ヤ綔鐘舵�� 1 ==>> 2
*/
- @Async
- public void generateStoreWrkFile0() {
+ public synchronized void generateStoreWrkFile0() {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鍏ュ簱鍙�
@@ -541,7 +541,7 @@
/**
* 鐩樼偣璐х墿鎶佃揪鐩樼偣鐩爣绔� wrkMast.sourceLoc P ===>> O
*/
- public void pickWrkCompleteStaNo() {
+ public synchronized void pickWrkCompleteStaNo() {
List<WrkMast> wrkMasts = wrkMastMapper.selectPick17(null, null);
for (WrkMast wrkMast : wrkMasts) {
// 淇敼婧愬簱浣嶇姸鎬� O.绌哄簱浣�
@@ -566,8 +566,7 @@
/**
* 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯
*/
- @Async
- public void crnStnToOutStn() {
+ public synchronized void crnStnToOutStn() {
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
// 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
@@ -612,6 +611,7 @@
// 鏇存柊宸ヤ綔妗ｇ姸鎬佷负 17.鍑哄簱瀹屾垚
wrkMast.setWrkSts(17L);
+ wrkMast.setSteNo(0);
wrkMast.setCrnEndTime(new Date());
if (wrkMastMapper.updateById(wrkMast) != 0) {
// 澶嶄綅鍫嗗灈鏈�
@@ -684,7 +684,7 @@
/**
* 鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鍒板簱浣�
*/
- public boolean crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol){
+ public synchronized boolean crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol){
for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
boolean flag = false;
// 鑾峰彇鍫嗗灈鏈哄叆搴撶珯淇℃伅
@@ -715,6 +715,18 @@
// log.error("{}绔欑偣鏌ヨ鏃犲緟鍏ュ簱鏁版嵁 宸ヤ綔鍙�={}", crnStn.getStaNo(), staProtocol.getWorkNo());
continue;
}
+
+ // 鍒ゆ柇鏄惁宸插瓨鍦ㄥ皬杞︾粦瀹氫换鍔�
+ BasSte basSte = basSteService.findByCrnNo(wrkMast.getCrnNo());
+ if(basSte == null) continue;
+ WrkMast one1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("ste_no",basSte.getSteNo())
+ .last(" and wrk_sts > 10"));
+ if(one1 != null){
+ log.error("{}鍏ュ簱浠诲姟鏃犳硶浣滀笟锛屽洜鍑哄簱浠诲姟宸茬粦瀹氬皬杞�!", wrkMast.getWrkNo());
+ continue;
+ }
+
if (wrkMast.getWrkSts() < 3) {
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
&& staDetl.getCanining()!=null && staDetl.getCanining().equals("Y")) {
@@ -897,11 +909,22 @@
/**
* 鍑哄簱 ===>> 搴撲綅鍒板爢鍨涙満绔�
*/
- public boolean locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
+ public synchronized boolean locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
// 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
WrkMast wrkMast = wrkMastMapper.selectPakOutStep111215(slave.getId(), crnStn.getStaNo());
if (wrkMast == null) {
+ continue;
+ }
+
+ // 鍒ゆ柇鏄惁宸插瓨鍦ㄥ皬杞︾粦瀹氫换鍔�
+ BasSte basSte = basSteService.findByCrnNo(wrkMast.getCrnNo());
+ if(basSte == null) continue;
+ WrkMast one1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("ste_no",basSte.getSteNo())
+ .last(" and wrk_sts < 10"));
+ if(one1 != null){
+ log.error("{}鍑哄簱浠诲姟鏃犳硶浣滀笟锛屽洜鍏ュ簱浠诲姟宸茬粦瀹氬皬杞�!", wrkMast.getWrkNo());
continue;
}
@@ -920,7 +943,6 @@
|| Utils.getLev(wrkMast.getSourceLocNo()) != Utils.getLev(one.getLocNo()))){
continue;
}
- log.info("");
}
//鍑哄簱搴撲綅涓嶆槸鏈�澶栧眰搴撲綅锛屽垽鏂祬搴撲綅缁勬槸鍚﹂兘涓虹┖锛屾垨瀛樺湪搴撲綅绉昏浆浠诲姟
@@ -1181,12 +1203,29 @@
/**
* 搴撲綅绉昏浆 NEW
*/
- public void locToLoc1(CrnSlave slave, CrnProtocol crnProtocol){
+ public synchronized void locToLoc1(CrnSlave slave, CrnProtocol crnProtocol){
// 鑾峰彇宸ヤ綔妗ｄ俊鎭�
WrkMast wrkMast = wrkMastMapper.selectLocMove(slave.getId());
if (null == wrkMast) {
return;
}
+ // 杩囨护
+ if (null != wrkMastMapper.selectPakin(slave.getId(), null)) {
+ log.error("{}鍑哄簱浠诲姟鏃犳硶浣滀笟锛屽洜瀛樺湪鍏ュ簱涓换鍔�!", wrkMast.getWrkNo());
+ return;
+ }
+
+ // 鍒ゆ柇鏄惁宸插瓨鍦ㄥ皬杞︾粦瀹氫换鍔�
+ BasSte basSte = basSteService.findByCrnNo(wrkMast.getCrnNo());
+ if(basSte == null) return;
+ WrkMast one = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("ste_no",basSte.getSteNo())
+ .last(" and io_type != 11 and wrk_sts < 10"));
+ if(one != null){
+ log.error("{}绉诲簱浠诲姟鏃犳硶浣滀笟锛屽洜鍏ュ簱浠诲姟宸茬粦瀹氬皬杞�!", wrkMast.getWrkNo());
+ return;
+ }
+
// 鑾峰彇婧愬簱浣嶄俊鎭�
LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
if (null == sourceLoc) {
@@ -1360,7 +1399,7 @@
/**
* 搴撲綅绉昏浆锛屽洖鍘熷簱浣�
*/
- public void locToLoc17(CrnSlave slave, CrnProtocol crnProtocol){
+ public synchronized void locToLoc17(CrnSlave slave, CrnProtocol crnProtocol){
// 鑾峰彇宸ヤ綔妗ｄ俊鎭�
WrkMast wrkMast = wrkMastMapper.selectLocMove17(slave.getId());
if (null == wrkMast) {
@@ -1370,7 +1409,13 @@
if (wrkMast.getWrkSts() == 17) {
//鏌ユ壘搴撲綅
boolean flag = false;
- String[] deeplocs = Utils.getDeepLocs(wrkMast.getSourceLocNo());
+// append
+ Integer row = Utils.getGroupRow(wrkMast.getSourceLocNo());
+ Integer bay = Utils.getBay(wrkMast.getSourceLocNo());
+ Integer lev = Utils.getLev(wrkMast.getSourceLocNo());
+
+ String locNo = Utils.append(row, bay, lev);
+ String[] deeplocs = Utils.getDeepLocs(locNo);
if(!Cools.isEmpty(deeplocs)){
for(String deepLocNo : deeplocs) {
LocMast deepLoc = locMastService.selectById(deepLocNo);
@@ -1386,7 +1431,7 @@
wrkMast.setIoPri((double)9999);
wrkMast.setWrkSts(2L);
wrkMast.setLocNo(deepLocNo);
- wrkMast.setSteNo(null);
+ wrkMast.setSteNo(0);
wrkMast.setModiTime(new Date());
if (wrkMastMapper.updateById(wrkMast) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 17.绉诲簱瀹屾垚 => 2.绉诲簱鍐嶅叆搴撲腑 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
@@ -1464,10 +1509,23 @@
// 鏈夊皬杞�
if (steNo != null) {
// 灏忚溅琛岃蛋鍒板爢鍨涙満寰呮惉绉荤偣
- if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
+ if (wrkMast.getWrkSts() == 2L && (wrkMast.getSteNo() == null || wrkMast.getSteNo() == 0)) {
// 娌℃湁鍏朵粬浠诲姟
if (null == wrkMastMapper.selectPakin(slave.getId(), steNo)) {
- this.letCarBeWaiting(wrkMast, steNo, wrkMast.getLocNo());
+ SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
+ SteProtocol steProtocol = steThread.getSteProtocol();
+ if (steProtocol == null) { return; }
+ if(steProtocol.getLoca()==3 || steProtocol.getLoca()==4){
+ //灏忚溅宸茬粡鍦ㄥ緟鏈轰綅鏃讹紝鏃犻渶涓嬪彂鍒板緟鏈轰綅浠诲姟锛岀洿鎺ユ洿鏂扮姸鎬佸井3锛屽悓鏃剁粦瀹氬皬杞�
+ wrkMast.setWrkSts(3L);
+ wrkMast.setSteNo(steNo);
+ wrkMast.setModiTime(new Date());
+ if (wrkMastMapper.updateById(wrkMast) == 0) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 缁戝畾绌挎杞� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
+ }
+ } else {
+ this.letCarBeWaiting(wrkMast, steNo, wrkMast.getLocNo());
+ }
}
}
// 鍫嗗灈鏈哄皢璐ф斁鑷冲皬杞︿笂 3.灏忚溅寰呮惉锛堝皬杞︿笉鐢ㄦ惉杩愶紝宸茬粡鍦ㄥ綋鍓嶇粍搴撲綅锛� / 6.灏忚溅寰呭叆 ===>> 7.鍚婅溅鍏ュ簱涓�
@@ -1512,7 +1570,7 @@
}
// 娌℃湁灏忚溅
} else {
- if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
+ if (wrkMast.getWrkSts() == 2L && (wrkMast.getSteNo() == null || wrkMast.getSteNo() == 0)) {
// 瀵绘壘褰撳墠鍫嗗灈鏈哄搴旂殑灏忚溅
SteThread steThread = queryIdleCar(wrkMast);
if (steThread != null) {
@@ -1540,7 +1598,7 @@
/**
* 搴撲綅绉昏浆
*/
- public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
+ public synchronized void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
// 鑾峰彇宸ヤ綔妗ｄ俊鎭�
WrkMast wrkMast = wrkMastMapper.selectLocMove(slave.getId());
if (null == wrkMast) {
@@ -1843,7 +1901,7 @@
/**
* 褰撳墠搴撲綅缁勬槸鍚﹀瓨鍦ㄧ┖闂插皬杞�
*/
- public Integer hasCar(String locNo) {
+ public synchronized Integer hasCar(String locNo) {
for (SteSlave ste : slaveProperties.getSte()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
@@ -1859,7 +1917,7 @@
/**
* 褰撳墠搴撲綅缁勬槸鍚﹀瓨鍦ㄧ┖闂插皬杞�
*/
- public Integer hasCarOfIdle(String locNo) {
+ public synchronized Integer hasCarOfIdle(String locNo) {
for (SteSlave ste : slaveProperties.getSte()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
@@ -1877,7 +1935,7 @@
/**
* 鏌ユ壘褰撳墠搴撲綅鏈�閫傚悎鐨勭┛姊溅鏉ヤ綔涓�
*/
- public SteThread queryIdleCar(WrkMast wrkMast) {
+ public synchronized SteThread queryIdleCar(WrkMast wrkMast) {
Integer crnNo = wrkMast.getCrnNo();
BasSte basSte = basSteService.findByCrnNo(crnNo);
// 鑾峰彇绌挎杞︿俊鎭�
@@ -1895,7 +1953,7 @@
* 璁╁皬杞︿粠 杩滅偣 ====>> 寰呮満
* 绛夊緟鍫嗗灈鏈烘惉杩�
*/
- public void letCarBeWaiting(WrkMast wrkMast, Integer steNo, String locNo) {
+ public synchronized void letCarBeWaiting(WrkMast wrkMast, Integer steNo, String locNo) {
// 鑾峰彇绌挎杞︿俊鎭�
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
SteProtocol steProtocol = steThread.getSteProtocol();
@@ -1932,7 +1990,7 @@
}
}
- public void letCarBeWaiting(WrkCharge wrkCharge, Integer steNo) {
+ public synchronized void letCarBeWaiting(WrkCharge wrkCharge, Integer steNo) {
// 鑾峰彇绌挎杞︿俊鎭�
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
SteProtocol steProtocol = steThread.getSteProtocol();
@@ -1975,7 +2033,7 @@
* 璁╁皬杞︿粠 杩滅偣 ====>> 绉诲姩鍒拌繎鐐�
* 绛夊緟鍫嗗灈鏈烘惉杩�
*/
- public void letCarBeReady(WrkMast wrkMast, Integer steNo, String locNo) {
+ public synchronized void letCarBeReady(WrkMast wrkMast, Integer steNo, String locNo) {
// 鑾峰彇绌挎杞︿俊鎭�
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
SteProtocol steProtocol = steThread.getSteProtocol();
@@ -2017,7 +2075,7 @@
* 璁╁皬杞︿粠 杩滅偣 ====>> 绉诲姩鍒拌繎鐐�
* 绛夊緟鍫嗗灈鏈烘惉杩�
*/
- public void letCarBeReady(WrkCharge wrkCharge, Integer steNo) {
+ public synchronized void letCarBeReady(WrkCharge wrkCharge, Integer steNo) {
// 鑾峰彇绌挎杞︿俊鎭�
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
SteProtocol steProtocol = steThread.getSteProtocol();
@@ -2056,7 +2114,7 @@
/**
* 鍏ュ嚭搴� ===>> 鍫嗗灈鏈烘惉鍏ュ皬杞�
*/
- public void carMoveIn(WrkMast wrkMast, Integer steNo, CrnProtocol crnProtocol) {
+ public synchronized void carMoveIn(WrkMast wrkMast, Integer steNo, CrnProtocol crnProtocol) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
SteProtocol steProtocol = steThread.getSteProtocol();
@@ -2134,7 +2192,7 @@
/**
* 鍏ュ簱 ===>> 鍫嗗灈鏈烘惉鍑哄皬杞�
*/
- public void carMoveOut(WrkMast wrkMast, Integer steNo, CrnProtocol crnProtocol) {
+ public synchronized void carMoveOut(WrkMast wrkMast, Integer steNo, CrnProtocol crnProtocol) {
// 鑾峰彇绌挎杞︿俊鎭�
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
SteProtocol steProtocol = steThread.getSteProtocol();
@@ -2186,9 +2244,8 @@
/**
* 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
*/
- @Async
@Transactional
- public void storeFinished() {
+ public synchronized void storeFinished() {
for (CrnSlave crn : slaveProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
@@ -2476,8 +2533,9 @@
// }
if (locMastService.isOutMost(wrkMast.getLocNo())) {
wrkMast.setWrkSts(17L);
+ wrkMast.setSteNo(0);
// 榛樿鐩爣搴撲綅鏄┖鏉�
- String locSts = "D";
+ String locSts = "";
// 搴撲綅绉昏浆鍒ゆ柇鏄惁涓虹┖鏉跨Щ杞�
if (wrkMast.getEmptyMk().equals("N")) {
locSts = "F";
@@ -2487,6 +2545,11 @@
continue;
}
}
+ if(Cools.isEmpty(locSts)){
+ log.error("搴撲綅绉昏浆 ===>> 搴撳瓨鐘舵�佷负绌猴紱[婧愬簱浣�={}],[鐩爣搴撲綅={}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
+ continue;
+ }
+
// 淇敼婧愬簱浣嶇姸鎬� ==> O
LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
if (null != sourceLoc) {
@@ -2760,7 +2823,7 @@
/**
* 寮傚父淇℃伅璁板綍
*/
- public void recErr() {
+ public synchronized void recErr() {
try {
this.recCrnErr();
this.recSteErr();
@@ -2772,7 +2835,7 @@
/**
* 鍫嗗灈鏈哄紓甯镐俊鎭褰�
*/
- private void recCrnErr(){
+ private synchronized void recCrnErr(){
Date now = new Date();
for (CrnSlave crn : slaveProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
@@ -3003,8 +3066,7 @@
/**
* 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
*/
- @Async
- public void storeEmptyPlt(){
+ public synchronized void storeEmptyPlt(){
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻绌烘澘鍏ュ簱鍙�
for (DevpSlave.Sta emptyInSta : devp.getEmptyInSta()) {
@@ -3094,8 +3156,7 @@
/**
* 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
*/
- @Async
- public void ledExecute() {
+ public synchronized void ledExecute() {
for (LedSlave led : slaveProperties.getLed()) {
// 鑾峰彇杈撻�佺嚎plc绾跨▼
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
@@ -3198,8 +3259,7 @@
/**
* 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
*/
- @Async
- public void ledReset() {
+ public synchronized void ledReset() {
for (LedSlave led : slaveProperties.getLed()) {
// 鑾峰彇杈撻�佺嚎plc绾跨▼
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
@@ -3570,7 +3630,7 @@
/**
* 鍥犳繁搴撲綅闃诲锛屽娴呭簱浣嶈繘琛岀Щ杞�
*/
- private void moveLocForDeepLoc(CrnSlave crn, LocMast shallowLoc){
+ private synchronized void moveLocForDeepLoc(CrnSlave crn, LocMast shallowLoc){
try {
String rows = "";
switch (crn.getId()){
@@ -3584,10 +3644,19 @@
rows = "18,19";
break;
}
- LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("crn_no",crn.getId())
+ LocMast loc = null;
+ List<LocMast> locs = locMastService.selectList(new EntityWrapper<LocMast>().eq("crn_no",crn.getId())
.eq("loc_type1",shallowLoc.getLocType1())
.eq("loc_sts","O")
.last(" and row1 in (" + rows + ") order by bay1,lev1"));
+ for (LocMast one : locs){
+ if(Utils.getGroupRow(one.getLocNo()) != Utils.getGroupRow(shallowLoc.getLocNo())
+ || Utils.getBay(one.getLocNo()) != Utils.getBay(shallowLoc.getLocNo())
+ || Utils.getLev(one.getLocNo()) != Utils.getLev(shallowLoc.getLocNo())){
+ loc = one;
+ break;
+ }
+ }
if (null == loc) {
log.error("娣卞簱浣嶅嚭搴� --- 娴呭簱浣嶉樆濉炲紓甯革紒 寰呯Щ杞祬搴撲綅锛�" + shallowLoc.getLocNo());
--
Gitblit v1.9.1