From 1f34f893783ea958bebd5ec95b92d23c0901a17b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 29 三月 2024 08:37:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 91403df..635ec36 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -196,7 +196,15 @@
}
//StaDesc staDesc1 = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no",inSta.getBackSta()));
- if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null){
+ boolean sign = true;
+ if (inSta.getBarcode() == 7 || inSta.getBarcode() == 8){
+
+ }else {
+ if (taskWrk.getCrnNo() != inSta.getBarcode()){
+ sign = false;
+ }
+ }
+ if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null && sign){
if ( taskWrk.getWrkNo() != null && taskWrk.getWrkNo().shortValue() == workNo ){
continue;
}
@@ -261,6 +269,11 @@
taskWrk.setOriginTargetPoint(getWmsDto.getTargetLocationCode());
taskWrk.setTargetPoint(Utils.getWcsLocNo(getWmsDto.getTargetLocationCode()));
taskWrk.setStartPoint(String.valueOf(inSta.getBackSta()));
+ if (inSta.getBarcode() == 7 || inSta.getBarcode() == 8){
+
+ }else {
+ taskWrk.setCrnNo(inSta.getBarcode());
+ }
if (!taskWrkService.updateById(taskWrk)){
log.error("淇濆瓨wms搴撲綅鍙峰け璐�");
}
@@ -455,7 +468,7 @@
if (taskWrkMapper.updateById(taskWrk) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
}
- TaskWrk taskWrk2 = taskWrkService.selectByWrkNo(staProtocol.getWorkNo().intValue());
+ TaskWrk taskWrk2 = taskWrkService.selectByWrkNo(taskWrk.getWrkNo());
if (taskWrk2.getWrkSts() != 3){
continue;
--
Gitblit v1.9.1