From 1192076b6eca2e4d96bc0647b8e9e76819e29612 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 31 一月 2023 14:36:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 3f53046..c81e106 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -304,10 +304,20 @@
case 104:
case 108:
staNo = 103;
+ BasDevp basDevp1 = basDevpService.selectOne(new EntityWrapper<BasDevp>()
+ .eq("dev_no", 104).or().eq("dev_no", 108).or().eq("dev_no", 109).eq("loading", "Y"));
+ if (!Cools.isEmpty(basDevp1)){
+ continue;
+ }
break;
case 204:
case 208:
staNo = 203;
+ BasDevp basDevp2 = basDevpService.selectOne(new EntityWrapper<BasDevp>()
+ .eq("dev_no", 204).or().eq("dev_no", 208).or().eq("dev_no", 209).eq("loading", "Y"));
+ if (!Cools.isEmpty(basDevp2)){
+ continue;
+ }
break;
default:
News.error("{}浠诲姟鍐嶅叆搴撳け璐ワ紝绯荤粺鏁版嵁寮傚父锛�", wrkMast.getWrkNo());
@@ -489,6 +499,7 @@
LocMast sourceLocMast = locMastService.selectById(sourceLocNo);
if (sourceLocMast.getLocSts().equals("P")) {
sourceLocMast.setLocSts("O");
+ sourceLocMast.setBarcode("");
sourceLocMast.setModiTime(new Date());
if (!locMastService.updateById(sourceLocMast)) {
throw new CoolException(wrkMast.getWrkNo() + "淇敼婧愬簱浣嶇姸鎬� O.绌哄簱浣�");
@@ -986,6 +997,14 @@
continue;
}
+ if (wrkMast.getWrkSts() == 11 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
+ Integer sour = wrkMast.getStaNo();
+ List<WrkMast> wrkMasts = wrkMastMapper.selectWrkStsAndIoType(sour);
+ if (wrkMasts.size()!=0){
+ continue;
+ }
+ }
+
// 鍒ゆ柇鏄惁宸插瓨鍦ㄥ皬杞︾粦瀹氫换鍔�
BasSte basSte = basSteService.findByCrnNo(wrkMast.getCrnNo());
if(basSte == null) continue;
--
Gitblit v1.9.1