From 179e4116a33beb31a19e4d1b1b4bbab56663aae3 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 31 一月 2023 14:45:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 20 ++++++++++++++++++++
1 files changed, 20 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..a8d56f2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -7,6 +7,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.mapper.WrkChargeMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
@@ -91,6 +92,8 @@
private CommonService commonService;
@Autowired
private WrkChargeMapper wrkChargeMapper;
+ @Autowired
+ private BasDevpMapper basDevpMapper;
/**
* 缁勬墭
@@ -304,10 +307,18 @@
case 104:
case 108:
staNo = 103;
+ List<BasDevp> basDevps1 = basDevpMapper.getLoading(103);
+ if (basDevps1.size()!=0){
+ continue;
+ }
break;
case 204:
case 208:
staNo = 203;
+ List<BasDevp> basDevps2 = basDevpMapper.getLoading(203);
+ if (basDevps2.size()!=0){
+ continue;
+ }
break;
default:
News.error("{}浠诲姟鍐嶅叆搴撳け璐ワ紝绯荤粺鏁版嵁寮傚父锛�", wrkMast.getWrkNo());
@@ -489,6 +500,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 +998,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