From 3cf23392ce90c0a99835afe2db3a81206e093819 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 25 九月 2025 10:02:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 655b13f..4655ba9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4441,7 +4441,7 @@
List<BasArmMast> basArmMastList = basArmMastService.selectList(
new EntityWrapper<BasArmMast>()
.eq("arm_no", basArm.getArmNo())
- .eq("sorting_line", basArm.getSortingLine())
+ .eq("sorting_line", basArm.getSortingLineSou())
.eq("status", 3)
);
if (basArmMastList.isEmpty()){
@@ -4449,10 +4449,10 @@
}
CombParam combParam = new CombParam(basArmMastList);
combParam.setBarcode(barcode);
- //璁剧疆宸ヤ綔绌洪棿灏辩华
+ //arm浠诲姟瀹屾垚鑷姩缁勬墭
ReturnT<String> result = new PostMesDataUtils().postMesData("arm浠诲姟瀹屾垚鑷姩缁勬墭",wmsUrl, wmsComb, combParam);
if (result.getCode()==200){
- basArmMastService.updateArmMastStatus(basArm.getArmNo(),basArm.getSortingLine(),3,4);
+ basArmMastService.updateArmMastStatus(basArm.getArmNo(),basArm.getSortingLineSou(),3,4);
} else {
log.error("鏈烘鑷傛姄鍙栦换鍔″畬鎴愶細"+JSON.toJSON(basArmMastList)+"===銆嬭嚜鍔ㄧ粍鎵樺け璐ワ紝绛夊緟閲嶈瘯");
}
@@ -4526,20 +4526,20 @@
List<BasArmMast> basArmMastListRuning = basArmMastService.selectList(
new EntityWrapper<BasArmMast>()
.eq("arm_no", basArm.getArmNo())
- .eq("sorting_line", basArm.getSortingLine())
+ .eq("sorting_line", basArm.getSortingLineSou())
.eq("status", 1)
);
List<BasArmMast> basArmMastListRuning3 = basArmMastService.selectList(
new EntityWrapper<BasArmMast>()
.eq("arm_no", basArm.getArmNo())
- .eq("sorting_line", basArm.getSortingLine())
+ .eq("sorting_line", basArm.getSortingLineSou())
.eq("status", 3)
);
if (basArmMastListRuning.isEmpty() && basArmMastListRuning3.isEmpty()){
List<BasArmMast> basArmMastList = basArmMastService.selectList(
new EntityWrapper<BasArmMast>()
.eq("arm_no", basArm.getArmNo())
- .eq("sorting_line", basArm.getSortingLine())
+ .eq("sorting_line", basArm.getSortingLineSou())
.eq("status", 0)
);
if (basArmMastList.isEmpty()){
@@ -4553,7 +4553,7 @@
List<BasArmMast> basArmMastListOrder = basArmMastService.selectList(
new EntityWrapper<BasArmMast>()
.eq("arm_no", basArm.getArmNo())
- .eq("sorting_line", basArm.getSortingLine())
+ .eq("sorting_line", basArm.getSortingLineSou())
.eq("sku", basArmMast.getSku())
.eq("order_no", basArmMast.getOrderNo())
);
@@ -4579,7 +4579,7 @@
continue;
}
}
- ArmTaskAssignmentParam armTaskAssignmentParam = new ArmTaskAssignmentParam(basArmMast.getSortingLine());
+ ArmTaskAssignmentParam armTaskAssignmentParam = new ArmTaskAssignmentParam(basArm.getSortingLine());
//璁剧疆宸ヤ綔绌洪棿灏辩华
ReturnT<String> result = new PostMesDataUtils().postMesData("鏈烘鑷傛姄鍙栦换鍔′笅鍙戯細閫氱煡宸ヤ綔绌洪棿宸插氨缁�",ArmConstant.getArmUrl(basArmMast.getArmNo()), ArmConstant.ARM_WORKSPACE, armTaskAssignmentParam);
if (result.getCode()==200){
--
Gitblit v1.9.1