From cf074430480e44eba1e6ddce09ccce9f28067120 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期三, 17 九月 2025 08:56:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 19 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 6de36df..64997b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -427,7 +427,7 @@
null // 澶囨敞
);
if (tagMapper.insert(priTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("涓�绾у垎绫诲垱寤哄紓甯革紝璇疯仈绯荤鐞嗗憳");
}
}
// 浜岀骇鍒嗙被
@@ -457,7 +457,7 @@
null // 澶囨敞
);
if (tagMapper.insert(secTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("浜岀骇鍒嗙被鍒涘缓寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
}
tagId = secTag.getId();
@@ -473,7 +473,7 @@
mat.setCreateTime(now);
mat.setUpdateTime(now);
if (!matService.insert(mat)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鐗╂枡淇℃伅鏂板寮傚父锛岃鑱旂郴绠＄悊鍛�");
} else {
log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
@@ -527,7 +527,7 @@
null // 澶囨敞
);
if (tagMapper.insert(priTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("涓�绾у垎绫诲垱寤哄紓甯革紝璇疯仈绯荤鐞嗗憳");
}
}
// 浜岀骇鍒嗙被
@@ -557,7 +557,7 @@
null // 澶囨敞
);
if (tagMapper.insert(secTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("浜岀骇鍒嗙被鍒涘缓寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
}
tagId = secTag.getId();
@@ -575,7 +575,7 @@
mat.setCreateTime(now);
mat.setUpdateTime(now);
if (!matService.insert(mat)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鏂板鐗╂枡淇℃伅寮傚父锛岃鑱旂郴绠＄悊鍛�");
} else {
log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
@@ -1138,7 +1138,16 @@
throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getStaNo()+" 鎵�澶勭珯鐐规枡绠辩爜寮傚父鐘舵�侊紱鏂欑鐮�==銆嬩负绌�"+basDevp.getBarcode());
}
if (!basDevp.getInEnable().equals("Y")){
- throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getStaNo()+" 鎵�澶勭珯鐐癸紝璇风瓑寰呯炕杞畬鎴愶紱鏂欑鐮�==銆�"+basDevp.getBarcode());
+ try{
+ Thread.sleep(500);
+ } catch (Exception e){
+
+ }
+ BasDevp basDevp1111 = basDevpService.selectById(param.getStaNo());
+ if (!basDevp1111.getInEnable().equals("Y")){
+ throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getStaNo()+" 鎵�澶勭珯鐐癸紝璇风瓑寰呯炕杞畬鎴愶紱鏂欑鐮�==銆�"+basDevp.getBarcode());
+ }
+
}
if (!CodeDetectionUtil.barcodeDetection(basDevp.getBarcode(),8)){
throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getStaNo()+" 鎵�澶勭珯鐐规枡绠辩爜寮傚父鐘舵�侊紱鏂欑鐮侊細"+basDevp.getBarcode());
@@ -1238,11 +1247,13 @@
ArrayList<LocDetl> locDetlArrayList = new ArrayList<>();
Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>()
.eq("matnr", param.getMatnr())
- .eq("weight", param.getWeight())
- .orderBy("batch", true);
- if (param.getDevNo() == 536) {
+ .eq("weight", param.getWeight());
+ if (param.getDevNo() == 536){
wrapper.eq("model", param.getModel())
- .eq("specs", param.getOrderNo());
+ .eq("specs", param.getOrderNo())
+ .orderBy("appe_time", true);
+ } else {
+ wrapper.orderBy("batch", true);
}
List<LocDetl> locDetls = locDetlService.selectList(wrapper);
@@ -1265,12 +1276,16 @@
Wrapper<LocDetl> locDetlWrapper = new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr())
.lt("weight", param.getWeight() + mat.getUnits())
.and()
- .gt("weight", param.getWeight())
- .orderBy("batch", true)
- .orderBy("weight", true);
+ .gt("weight", param.getWeight());
if (param.getDevNo() == 536){
locDetlWrapper.eq("model", param.getModel())
- .eq("specs", param.getOrderNo());
+ .eq("specs", param.getOrderNo())
+ .orderBy("appe_time", true)
+ .orderBy("weight", true);
+ } else {
+ locDetlWrapper
+ .orderBy("batch", true)
+ .orderBy("weight", true);
}
locDetls = locDetlService.selectList(locDetlWrapper);
if (locDetls.isEmpty()){
@@ -1291,12 +1306,16 @@
Wrapper<LocDetl> locDetlWrapper = new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr())
.gt("weight", param.getWeight() - mat.getUnits())
.and()
- .lt("weight", param.getWeight())
- .orderBy("batch", true)
- .orderBy("weight", false);
+ .lt("weight", param.getWeight());
if (param.getDevNo() == 536){
locDetlWrapper.eq("model", param.getModel())
- .eq("specs", param.getOrderNo());
+ .eq("specs", param.getOrderNo())
+ .orderBy("appe_time", true)
+ .orderBy("weight", false);
+ } else {
+ locDetlWrapper
+ .orderBy("batch", true)
+ .orderBy("weight", false);
}
locDetls = locDetlService.selectList(locDetlWrapper);
--
Gitblit v1.9.1