From a00400cf9f975a7dbccf3436cf3b57c1fb476597 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 15 十月 2025 09:15:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 ++++-
src/main/resources/mapper/BasArmMastMapper.xml | 14 +++++++++++++-
src/main/java/com/zy/asrs/service/BasArmMastService.java | 1 +
src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java | 1 +
src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java | 2 +-
src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java | 5 +++++
6 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java b/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
index 5f90abd..b9cdcad 100644
--- a/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
@@ -63,7 +63,7 @@
public ArmOrderAssignmentParam() {}
public ArmOrderAssignmentParam(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
- order_id = basArmMast.getSku()+sign_arm_sku+basArmMast.getOrderNo()+sign_arm_order+(basArmMast.getSortingLine()+1)%2;
+ order_id = basArmMast.getSku()+sign_arm_sku+basArmMast.getBindingTags()+sign_arm_sku+basArmMast.getOrderNo()+sign_arm_order+(basArmMast.getSortingLine()+1)%2;
List<OrderItem> orderItemArrayList= new ArrayList<>();
OrderItem orderItem = new OrderItem(basArmMast,orderDetlValueResultUtil);
orderItemArrayList.add(orderItem);
diff --git a/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java b/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java
index 40058c7..f2a148b 100644
--- a/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java
@@ -14,4 +14,5 @@
boolean updateArmMastStatus(@Param("armNo")int armNo, @Param("sortingLine")int sortingLine, @Param("status")int status, @Param("endStatus")int endStatus);
Double selectOrderDetlAndSku(@Param("orderNo")String orderNo, @Param("sku")String sku);
OrderDetlValueResultUtil selectOrderDetlValue(@Param("orderNo")String orderNo, @Param("sku")String sku);
+ Double selectBasArmMastSignValue(@Param("orderNo")String orderNo, @Param("sku")String sku, @Param("bindingTags")Long bindingTags);
}
diff --git a/src/main/java/com/zy/asrs/service/BasArmMastService.java b/src/main/java/com/zy/asrs/service/BasArmMastService.java
index f30151f..c8e5ce7 100644
--- a/src/main/java/com/zy/asrs/service/BasArmMastService.java
+++ b/src/main/java/com/zy/asrs/service/BasArmMastService.java
@@ -9,5 +9,6 @@
boolean updateArmMastStatus(int armNo,int sortingLine,int status,int endStatus);
Double selectOrderDetlAndSku(String order,String sku);
OrderDetlValueResultUtil selectOrderDetlValue(String order, String sku);
+ Double selectBasArmMastSignValue(String order, String sku,Long bindingTags);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java
index fa1c414..00d4441 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java
@@ -24,4 +24,9 @@
public OrderDetlValueResultUtil selectOrderDetlValue(String order, String sku){
return this.baseMapper.selectOrderDetlValue(order,sku);
}
+
+ @Override
+ public Double selectBasArmMastSignValue(String order, String sku,Long bindingTags){
+ return this.baseMapper.selectBasArmMastSignValue(order,sku,bindingTags);
+ }
}
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 67919d7..a828e56 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4254,7 +4254,7 @@
continue;
}
if (basArmMastList.size()>1){
- armTaskAssignmentCallApiLogSave(staProtocol, "浠诲姟寰呮墽琛屾暟閲忓ぇ浜�1", "arm缂栧彿锛�"+basArm.getArmNo()+"====銆嬫媶鐮佸灈浠诲姟寮傚父绂佹涓嬪彂锛侊紒锛佷换鍔″緟鎵ц鏁伴噺澶т簬1锛侊紒锛�", false);
+ armTaskAssignmentCallApiLogSave(staProtocol, "浠诲姟寰呮墽琛屾暟閲忓ぇ浜�1,鏃犳硶鍒嗚鲸寰呮墽琛屼换鍔�", "arm缂栧彿锛�"+basArm.getArmNo()+"====銆嬫媶鐮佸灈浠诲姟寮傚父绂佹涓嬪彂锛侊紒锛佷换鍔″緟鎵ц鏁伴噺澶т簬1锛侊紒锛�", false);
// log.error("arm缂栧彿锛�"+basArm.getArmNo()+"====銆嬫媶鐮佸灈浠诲姟寮傚父绂佹涓嬪彂锛侊紒锛佷换鍔″緟鎵ц鏁伴噺澶т簬1锛侊紒锛�");
continue;
@@ -4266,6 +4266,7 @@
.eq("sorting_line", basArm.getSortingLineSou())
.eq("sku", basArmMast.getSku())
.eq("order_no", basArmMast.getOrderNo())
+ .eq("binding_tags", basArmMast.getBindingTags())
);
if (basArmMastListOrder.size()==1){
OrderDetlValueResultUtil orderDetlValueResultUtil = basArmMastService.selectOrderDetlValue(basArmMast.getOrderNo(), basArmMast.getSku());
@@ -4273,6 +4274,8 @@
if (Cools.isEmpty(orderDetlValueResultUtil)){
continue;
}
+ Double anfmeSign = basArmMastService.selectBasArmMastSignValue(basArmMast.getOrderNo(), basArmMast.getSku(),basArmMast.getBindingTags());
+ orderDetlValueResultUtil.setAnfme(anfmeSign);
//璁㈠崟涓嬪彂
try{
ArmOrderAssignmentParam armOrderAssignmentParam = new ArmOrderAssignmentParam(basArmMast,orderDetlValueResultUtil);
diff --git a/src/main/resources/mapper/BasArmMastMapper.xml b/src/main/resources/mapper/BasArmMastMapper.xml
index 016069c..3d3f75b 100644
--- a/src/main/resources/mapper/BasArmMastMapper.xml
+++ b/src/main/resources/mapper/BasArmMastMapper.xml
@@ -54,7 +54,7 @@
</select>
<select id="selectOrderDetlValue" resultMap="BaseResultMapOrderDetlValue">
- select
+ select top 1
d.man_length,d.width,d.height,d.weight,d.anfme
from man_order_detl d
where 1=1
@@ -62,4 +62,16 @@
and d.matnr = #{sku}
</select>
+
+
+ <select id="selectBasArmMastSignValue" resultType="java.lang.Double">
+ select top 1
+ d.anfme
+ from asr_bas_arm_mast_sign d
+ where 1=1
+ and d.order_no = #{orderNo}
+ and d.sku = #{sku}
+ and d.create_time = #{bindingTags}
+ </select>
+
</mapper>
--
Gitblit v1.9.1