From e5efee3f0b701eb448eb1a0b82a930e29a602c44 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 09 九月 2025 09:13:34 +0800
Subject: [PATCH] #自动下发分拣线单据
---
src/main/java/com/zy/asrs/entity/param/OrderToLine.java | 68 ++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 7 +--
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 17 ++++++++
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 2
4 files changed, 88 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderToLine.java b/src/main/java/com/zy/asrs/entity/param/OrderToLine.java
new file mode 100644
index 0000000..7f8ab49
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/OrderToLine.java
@@ -0,0 +1,68 @@
+package com.zy.asrs.entity.param;
+
+import com.zy.common.model.MesPakoutParam;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class OrderToLine {
+ /**
+ * 鍗曟嵁缂栧彿
+ */
+ private String OrderNo;
+
+ /**
+ * 鏃堕棿鎴�
+ */
+ private Long createTime;
+
+ /**
+ * 鐗╂枡鍒楄〃
+ */
+ private List<MatList> matList = new ArrayList<>();
+
+ @Data
+ public static class MatList {
+
+ // Sku\瀹汉鍨嬪彿\鍒嗘嫞灞炴��1\涓嶅彲涓虹┖\鎵爜鍙幏鍙�
+ private String sku;
+
+ // Po\瀹汉PO\鍒嗘嫞灞炴��2锛堝彲浜哄伐寮�鍏筹級\鍙互涓虹┖瀛楃涓诧紝闈濶ULL\鎵爜鍙幏鍙�
+ private String po;
+
+ //绠辨暟
+ private Float ctns;
+
+ //鏉＄爜鍊糪闈炲垎鎷ｅ睘鎬э紙鍙汉宸ュ紑鍏筹級\涓嶅彲涓虹┖\鎵爜鍙幏鍙�
+ private String upc;
+
+ //鏍囪瘑锛歕闈炲垎鎷ｅ睘鎬�
+ //1:鎵ц鍒嗘嫞
+ //0锛氫笉鍒嗘嫞锛屽湪绾夸綋寰幆
+ private Integer sign;
+
+ //璐ф簮\闈炲垎鎷ｅ睘鎬э紙涓嶄笅鍙戯紝鏁版嵁鍦ㄦ潯鐮佷腑锛岄渶涓婃姤锛�
+ private String supplier;
+
+ //缁戝畾鏍囪锛堟爣璇嗙浉鍚屽繀椤诲幓鍚屼竴涓垎鎷ｅ彛锛�
+ private Long binding_tags;
+
+ public MatList() {
+ }
+ public MatList(String sku, String po) {
+ this.sku = sku;
+ this.po = po;
+ }
+ public MatList(String sku, String po, Float ctns, String upc, Integer sign, String supplier, Long binding_tags) {
+ this.sku = sku;
+ this.po = po;
+ this.ctns = ctns;
+ this.upc = upc;
+ this.sign = sign;
+ this.supplier = supplier;
+ this.binding_tags = binding_tags;
+ }
+ }
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
index f898eff..efe6217 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
@@ -42,7 +42,7 @@
Integer wrkRgv1 = wrkMastStaMapper.wrkCount1();
Integer wrkRgv2 = wrkMastStaMapper.wrkCount2();
- Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>();
+ Wrapper<StaDesc> wrapper = new EntityWrapper<>();
// 鉁� 濡傛灉 wrkRgv1 < wrkRgv2锛屽垯澶氬姞涓�涓潯浠�
if (wrkRgv1 < wrkRgv2) {
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 2cfd50a..30c0c4c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -364,7 +364,7 @@
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("N");
wrkMast.setBarcode(locMast.getBarcode());
- if (Boolean.parseBoolean(config.getValue()) && locMastRgv.getLocNo() != null) { //鑻ユ湁绌哄簱浣嶄笖閰嶇疆鍏佽鍒欑粦瀹氬叾澶囨枡搴撲綅鍙�
+ if (Boolean.parseBoolean(config.getValue()) && locMastRgv.getLocNo() != null && ioType != 107) { //鑻ユ湁绌哄簱浣嶄笖閰嶇疆鍏佽鍒欑粦瀹氬叾澶囨枡搴撲綅鍙�
wrkMast.setLocNo(locMastRgv.getLocNo());
wrkMast.setTakeNone("0"); //0rgv鏈彇锛�1rgv宸插彇璐�
}
@@ -394,16 +394,13 @@
}
}
//淇敼agv澶囨枡鍖虹姸鎬�
- if(locMastRgv.getLocSts().equals("O")){
+ if(locMastRgv.getLocSts().equals("O") && ioType != 107){
locMastRgv.setLocSts("S");
locMastRgv.setModiUser(userId);
locMastRgv.setModiTime(now);
if (!locMastService.updateById(locMastRgv)) {
throw new CoolException("棰勭害agv澶囨枡鍖哄簱浣嶇姸鎬佸け璐ワ紝搴撲綅鍙凤細"+locMastRgv.getLocNo());
}
- }else{
- throw new CoolException(locMastRgv.getLocNo() + "澶囨枡鍖轰笉鏄┖搴撲綅鐘舵��");
-
}
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectById(dto.getLocNo());
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
new file mode 100644
index 0000000..f47d516
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -0,0 +1,17 @@
+package com.zy.asrs.task;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+//璁㈠崟涓嬪彂鑷冲垎鎷ｇ嚎
+public class OrderToSortLineScheduler {
+
+// @Scheduled(cron = "0/3 * * * * ? ")
+ private void orderToSortLine() {
+
+ }
+
+}
--
Gitblit v1.9.1