From 4559e9052e8ffcef4062650328c95a31bca05038 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期一, 23 三月 2026 14:40:55 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 8309015..b458489 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -31,6 +31,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@@ -49,9 +50,9 @@
// 浜屾ゼ鍫嗗灈鏈哄搴斿叆搴撶珯鐐�
private static final int[] secondFloorIn = new int[]{0, 2061, 2064, 2067, 2070, 2073, 2076};
// 鍫嗗灈鏈哄搴斾竴妤煎嚭搴撶珯鐐�
- private static final int[] secondFloorOut = new int[]{0, 3002, 3003, 3006, 3008, 3009, 3012};
+ private static final int[] secondFloorOut = new int[]{0, 3002, 3003, 3006, 3008, 3009, 3011};
// 鍫嗗灈鏈哄搴斾竴妤煎叆搴撶珯鐐�
- private static final int[] oneFloorIn = new int[]{0, 3001, 3004, 3005, 3007, 3010, 3011};
+ private static final int[] oneFloorIn = new int[]{0, 3001, 3004, 3005, 3007, 3010, 3012};
@Autowired
@@ -1442,8 +1443,14 @@
} else if (wrkMast.getSourceStaNo() == 3046 || wrkMast.getSourceStaNo() == 3042) {
wrkMast.setBarcode(param.getBarcode());
}
- wrkMastService.updateById(wrkMast);
+ boolean b = wrkMastService.updateById(wrkMast);
+ WrkMast wrkMas2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getWorkNo()));
+ log.error("{}浠诲姟鐘舵�佹敼鍙樹负锛歿},鏇存柊璁板綍{}",wrkMas2.getWrkNo(),wrkMas2.getWrkSts(),b);
+// wrkMastService.checkDb(param.getWorkNo());
+ if(!b) {
+ throw new CoolException("娌℃湁鏇存柊鍒拌褰�");
+ }
return "璇锋眰鎴愬姛";
}
@@ -2574,7 +2581,7 @@
List<UnQualifiedOrderConfirmParam.VolumeNumber> volumeNumbers = param.getVolumeNumbers();
for (UnQualifiedOrderConfirmParam.VolumeNumber v :volumeNumbers){
if (!Cools.isEmpty(v.getVolumeNumber())&&!Cools.isEmpty(param.getQualified())){
- locDetlMapper.updateQualifiedByBrand(v.getVolumeNumber(), param.getQualified());
+ locDetlMapper.updateQualifiedByBrand(v.getVolumeNumber(), param.getQualified(),param.getRemark());
}
}
return R.ok("缁勮揣纭鎴愬姛");
--
Gitblit v1.9.1