From 5ae3b6c3d604f16c2ecc5057d720d5d79c8c091b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 23 十一月 2025 14:21:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 7 ++++---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++-----
src/main/resources/mapper/BasArmMastMapper.xml | 6 +++---
src/main/java/com/zy/asrs/service/BasArmMastService.java | 6 +++---
src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java | 6 +++---
src/main/java/com/zy/core/MainProcess.java | 4 ++--
src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java | 12 ++++++------
8 files changed, 28 insertions(+), 27 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 b9cdcad..723d87c 100644
--- a/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
@@ -44,7 +44,7 @@
public SKUInfo() {};
public SKUInfo(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil){
- id = basArmMast.getSku();
+ id = basArmMast.getMatnr();
length = orderDetlValueResultUtil.getLength();
width = orderDetlValueResultUtil.getWidth();
weight = orderDetlValueResultUtil.getWeight();
@@ -63,7 +63,7 @@
public ArmOrderAssignmentParam() {}
public ArmOrderAssignmentParam(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
- order_id = basArmMast.getSku()+sign_arm_sku+basArmMast.getBindingTags()+sign_arm_sku+basArmMast.getOrderNo()+sign_arm_order+(basArmMast.getSortingLine()+1)%2;
+ order_id = basArmMast.getMatnr()+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/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 5f9bb44..71758ef 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -51,7 +51,7 @@
// 瑙勬牸
private String specs = "";
- private String supp = "";
+// private String supp = "";
// sku
private String sku = "";
@@ -63,12 +63,13 @@
}
public CombMat(BasArmMast basArmMast) {
this.orderNo = basArmMast.getOrderNo();
- this.matnr = basArmMast.getSku();
+ this.matnr = basArmMast.getMatnr();
// this.batch = basArmMast.getCreateTime().toString();
this.anfme = basArmMast.getCtns().doubleValue();
this.standby1 = basArmMast.getPo();
this.standby2 = basArmMast.getUpc();
- this.supp = basArmMast.getSupplier();
+ this.standby3 = basArmMast.getSku();
+// this.supp = basArmMast.getSupplier();
}
}
diff --git a/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java b/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java
index f2a148b..cc103e7 100644
--- a/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java
@@ -12,7 +12,7 @@
public interface BasArmMastMapper extends BaseMapper<BasArmMast> {
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);
+ Double selectOrderDetlAndSku(@Param("orderNo")String orderNo, @Param("matnr")String matnr);
+ OrderDetlValueResultUtil selectOrderDetlValue(@Param("orderNo")String orderNo, @Param("matnr")String matnr);
+ Double selectBasArmMastSignValue(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @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 c8e5ce7..0062637 100644
--- a/src/main/java/com/zy/asrs/service/BasArmMastService.java
+++ b/src/main/java/com/zy/asrs/service/BasArmMastService.java
@@ -7,8 +7,8 @@
public interface BasArmMastService extends IService<BasArmMast> {
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);
+ Double selectOrderDetlAndSku(String order,String matnr);
+ OrderDetlValueResultUtil selectOrderDetlValue(String order, String matnr);
+ Double selectBasArmMastSignValue(String order, String matnr,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 00d4441..991ae36 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java
@@ -16,17 +16,17 @@
}
@Override
- public Double selectOrderDetlAndSku(String order,String sku){
- return this.baseMapper.selectOrderDetlAndSku(order,sku);
+ public Double selectOrderDetlAndSku(String order,String matnr){
+ return this.baseMapper.selectOrderDetlAndSku(order,matnr);
}
@Override
- public OrderDetlValueResultUtil selectOrderDetlValue(String order, String sku){
- return this.baseMapper.selectOrderDetlValue(order,sku);
+ public OrderDetlValueResultUtil selectOrderDetlValue(String order, String matnr){
+ return this.baseMapper.selectOrderDetlValue(order,matnr);
}
@Override
- public Double selectBasArmMastSignValue(String order, String sku,Long bindingTags){
- return this.baseMapper.selectBasArmMastSignValue(order,sku,bindingTags);
+ public Double selectBasArmMastSignValue(String order, String matnr,Long bindingTags){
+ return this.baseMapper.selectBasArmMastSignValue(order,matnr,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 afd9cbf..0a2b19e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4379,7 +4379,7 @@
//arm浠诲姟瀹屾垚鑷姩缁勬墭
ReturnT<String> result = new PostMesDataUtils().postMesData("arm浠诲姟瀹屾垚鑷姩缁勬墭",wmsUrl, wmsComb, combParam);
if (result.getCode()==200){
- basArmMastService.updateArmMastStatus(basArm.getArmNo(),basArm.getSortingLineSou(),3,4);
+ basArmMastService.updateArmMastStatus(basArm.getArmNo(),basArm.getSortingLineSou(),3,5);
} else {
armTaskAssignmentCallApiLogSave(staProtocol, "鑷姩缁勬墭澶辫触", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛�===銆嬭嚜鍔ㄧ粍鎵樺け璐ワ紝绛夊緟閲嶈瘯", false);
// log.error("鏈烘鑷傛姄鍙栦换鍔″畬鎴愶細"+JSON.toJSON(basArmMastList)+"===銆嬭嚜鍔ㄧ粍鎵樺け璐ワ紝绛夊緟閲嶈瘯");
@@ -4548,7 +4548,7 @@
new EntityWrapper<BasArmMast>()
.eq("arm_no", basArm.getArmNo())
.eq("sorting_line", basArm.getSortingLineSou())
- .eq("sku", basArmMast.getSku())
+ .eq("matnr", basArmMast.getMatnr())
.eq("order_no", basArmMast.getOrderNo())
.eq("binding_tags", basArmMast.getBindingTags())
);
@@ -4573,7 +4573,7 @@
.eq("status", 2)
.eq("binding_tags", basArmMast.getBindingTags())
);
- Double anfmeSignOne = basArmMastService.selectBasArmMastSignValue(basArmMastOne.getOrderNo(), basArmMastOne.getSku(),basArmMastOne.getBindingTags());
+ Double anfmeSignOne = basArmMastService.selectBasArmMastSignValue(basArmMastOne.getOrderNo(), basArmMastOne.getMatnr(),basArmMastOne.getBindingTags());
if (anfmeSignOne>1D){
armTaskAssignmentCallApiLogSave(staProtocol, "鏉＄爜鏁版嵁宸插瓨鍦紒锛侊紒", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛屾潯鐮佹暟鎹鍦ㄨ嚜鍔ㄧ粍鎵�===>>" + barcode, false);
@@ -4582,12 +4582,12 @@
}
}
- OrderDetlValueResultUtil orderDetlValueResultUtil = basArmMastService.selectOrderDetlValue(basArmMast.getOrderNo(), basArmMast.getSku());
+ OrderDetlValueResultUtil orderDetlValueResultUtil = basArmMastService.selectOrderDetlValue(basArmMast.getOrderNo(), basArmMast.getMatnr());
if (Cools.isEmpty(orderDetlValueResultUtil)){
continue;
}
- Double anfmeSign = basArmMastService.selectBasArmMastSignValue(basArmMast.getOrderNo(), basArmMast.getSku(),basArmMast.getBindingTags());
+ Double anfmeSign = basArmMastService.selectBasArmMastSignValue(basArmMast.getOrderNo(), basArmMast.getMatnr(),basArmMast.getBindingTags());
orderDetlValueResultUtil.setAnfme(anfmeSign);
//璁㈠崟涓嬪彂
try{
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 534f44b..d741421 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -141,8 +141,8 @@
}
//arm浠诲姟瀹屾垚
- mainService.armMissionAccomplished();//4==>5
- mainService.armMissionAccomplishedScanToCheckIn();//3===銆�4
+ mainService.armMissionAccomplished();//3==>4 ====> 3===銆�5
+// mainService.armMissionAccomplishedScanToCheckIn();//4===銆�5
//arm浠诲姟涓嬪彂
mainService.armTaskAssignment();//0===銆�1
diff --git a/src/main/resources/mapper/BasArmMastMapper.xml b/src/main/resources/mapper/BasArmMastMapper.xml
index 3d3f75b..f0fe702 100644
--- a/src/main/resources/mapper/BasArmMastMapper.xml
+++ b/src/main/resources/mapper/BasArmMastMapper.xml
@@ -50,7 +50,7 @@
from man_order_detl
where 1=1
and order_no = #{orderNo}
- and matnr = #{sku}
+ and matnr = #{matnr}
</select>
<select id="selectOrderDetlValue" resultMap="BaseResultMapOrderDetlValue">
@@ -59,7 +59,7 @@
from man_order_detl d
where 1=1
and d.order_no = #{orderNo}
- and d.matnr = #{sku}
+ and d.matnr = #{matnr}
</select>
@@ -70,7 +70,7 @@
from asr_bas_arm_mast_sign d
where 1=1
and d.order_no = #{orderNo}
- and d.sku = #{sku}
+ and d.matnr = #{matnr}
and d.create_time = #{bindingTags}
</select>
--
Gitblit v1.9.1