From 766b76e287b7be3a51a9448d5045c39ec6c245f8 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 23 九月 2025 22:13:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 7 ++++---
src/main/java/com/zy/asrs/entity/BasArm.java | 14 ++++++++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 16 ++++++++--------
src/main/resources/mapper/BasArmMapper.xml | 2 ++
src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java | 6 +++---
src/main/resources/application.yml | 4 ++--
6 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasArm.java b/src/main/java/com/zy/asrs/entity/BasArm.java
index e5aa54b..db08561 100644
--- a/src/main/java/com/zy/asrs/entity/BasArm.java
+++ b/src/main/java/com/zy/asrs/entity/BasArm.java
@@ -45,6 +45,20 @@
@TableField("sorting_line")
private Integer sortingLine;
+ /**
+ * 鎷嗗灈浣�
+ */
+ @ApiModelProperty(value= "鎷嗗灈浣�")
+ @TableField("sorting_line_sou")
+ private Integer sortingLineSou;
+
+ /**
+ * 鐮佸灈浣�
+ */
+ @ApiModelProperty(value= "鐮佸灈浣�")
+ @TableField("sta_no_sou")
+ private Integer staNoSou;
+
@ApiModelProperty(value= "")
private Integer status;
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 b952d93..5f90abd 100644
--- a/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
@@ -55,15 +55,15 @@
public OrderItem() {};
public OrderItem(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
target_num = orderDetlValueResultUtil.getAnfme().intValue();
- from = basArmMast.getSortingLine().toString();
- to = basArmMast.getStaNo().toString();
+ from = String.valueOf((basArmMast.getSortingLine()+1)%2);
+ to = String.valueOf((basArmMast.getSortingLine()+1)%2+2);
sku_info = new SKUInfo(basArmMast,orderDetlValueResultUtil);
};
}
public ArmOrderAssignmentParam() {}
public ArmOrderAssignmentParam(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
- order_id = basArmMast.getSku()+sign_arm_sku+basArmMast.getOrderNo()+sign_arm_order+String.valueOf(basArmMast.getSortingLine());
+ order_id = basArmMast.getSku()+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 0580fb9..41c2728 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -62,11 +62,12 @@
}
public CombMat(BasArmMast basArmMast) {
this.orderNo = basArmMast.getOrderNo();
- this.matnr = basArmMast.getMatnr();
+ this.matnr = basArmMast.getSku();
// this.batch = basArmMast.getCreateTime().toString();
this.anfme = basArmMast.getCtns().doubleValue();
- this.specs = basArmMast.getOrderNo();
- this.sku = basArmMast.getSku();
+ this.specs = basArmMast.getPo();
+ this.brand = basArmMast.getUpc();
+ this.standby1 = basArmMast.getSupplier();
}
}
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..1eea636 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.getSortingLineSou());
//璁剧疆宸ヤ綔绌洪棿灏辩华
ReturnT<String> result = new PostMesDataUtils().postMesData("鏈烘鑷傛姄鍙栦换鍔′笅鍙戯細閫氱煡宸ヤ綔绌洪棿宸插氨缁�",ArmConstant.getArmUrl(basArmMast.getArmNo()), ArmConstant.ARM_WORKSPACE, armTaskAssignmentParam);
if (result.getCode()==200){
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 16deb0c..46a92d1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,8 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=jshdasrs
-# url: jdbc:sqlserver://10.10.10.235:1433;databasename=jshdasrs
+# url: jdbc:sqlserver://localhost:1433;databasename=jshdasrs
+ url: jdbc:sqlserver://10.10.10.198:1433;databasename=jshdasrs
username: sa
password: sa@123
# url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
diff --git a/src/main/resources/mapper/BasArmMapper.xml b/src/main/resources/mapper/BasArmMapper.xml
index 5b54298..2cf9611 100644
--- a/src/main/resources/mapper/BasArmMapper.xml
+++ b/src/main/resources/mapper/BasArmMapper.xml
@@ -8,6 +8,8 @@
<result column="arm_no" property="armNo" />
<result column="sta_no" property="staNo" />
<result column="sorting_line" property="sortingLine" />
+ <result column="sta_no_sou" property="staNoSou" />
+ <result column="sorting_line_sou" property="sortingLineSou" />
<result column="status" property="status" />
</resultMap>
--
Gitblit v1.9.1