From 84edd2b6308fa018eab932a2db528b7e6e1e6d13 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 19 十一月 2025 16:45:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 6 +-
src/main/java/com/zy/asrs/entity/param/CombParam.java | 6 +-
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 6 +-
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 6 +-
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 2
src/main/java/com/zy/asrs/entity/OrderDetl.java | 6 +-
src/main/java/com/zy/asrs/entity/OrderDetlPakin.java | 6 +-
src/main/resources/mapper/OrderDetlPakinMapper.xml | 2
src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java | 6 +-
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 6 +-
src/main/java/com/zy/asrs/entity/WaitPakin.java | 6 +-
src/main/java/com/zy/asrs/entity/LocDetl.java | 6 +-
src/main/webapp/views/index.html | 4 +-
src/main/java/com/zy/asrs/entity/WrkDetl.java | 6 +-
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 6 +-
src/main/java/com/zy/asrs/utils/ToSortLineUtils.java | 2
src/main/java/com/zy/asrs/entity/param/PickMatParam.java | 6 +-
src/main/resources/application.yml | 4 +-
18 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 129453c..356f4a4 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -172,19 +172,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "";
+ private String standby1 = "1";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "";
+ private String standby2 = "1";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "";
+ private String standby3 = "1";
/**
* 澶囩敤1
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 33ced76..048246d 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -318,19 +318,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "";
+ private String standby1 = "1";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "";
+ private String standby2 = "1";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "";
+ private String standby3 = "1";
/**
* 澶囩敤1
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
index b9ea4ce..0b2ac12 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -317,19 +317,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "";
+ private String standby1 = "1";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "";
+ private String standby2 = "1";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "";
+ private String standby3 = "1";
/**
* 澶囩敤1
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 2c80df8..830fb37 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -317,19 +317,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "";
+ private String standby1 = "1";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "";
+ private String standby2 = "1";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "";
+ private String standby3 = "1";
/**
* 澶囩敤1
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index e1bfb4c..3a7b1c3 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -160,19 +160,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "";
+ private String standby1 = "1";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "";
+ private String standby2 = "1";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "";
+ private String standby3 = "1";
/**
* 澶囩敤1
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index d8c7306..e0620a4 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -159,19 +159,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "";
+ private String standby1 = "1";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "";
+ private String standby2 = "1";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "";
+ private String standby3 = "1";
/**
* 澶囩敤1
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 9563fff..f209bef 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -274,19 +274,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "";
+ private String standby1 = "1";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "";
+ private String standby2 = "1";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "";
+ private String standby3 = "1";
/**
* 澶囩敤1
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 6fa1590..6806082 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -274,19 +274,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "";
+ private String standby1 = "1";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "";
+ private String standby2 = "1";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "";
+ private String standby3 = "1";
/**
* 澶囩敤1
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 1182ad6..d8b9eef 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -32,9 +32,9 @@
// 搴忓垪鐮�
private String batch = "";
private String brand = "";
- private String standby1 = "";
- private String standby2 = "";
- private String standby3 = "";
+ private String standby1 = "1";
+ private String standby2 = "1";
+ private String standby3 = "1";
private String boxType1 = "1";
private String boxType2 = "1";
diff --git a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
index 673903f..d21326f 100644
--- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -29,9 +29,9 @@
private String batch;
private String specs = "";
private String brand = "";
- private String standby1 = "";
- private String standby2 = "";
- private String standby3 = "";
+ private String standby1 = "1";
+ private String standby2 = "1";
+ private String standby3 = "1";
private String boxType1 = "1";
private String boxType2 = "1";
private String boxType3 = "1";
diff --git a/src/main/java/com/zy/asrs/entity/param/PickMatParam.java b/src/main/java/com/zy/asrs/entity/param/PickMatParam.java
index 93f362c..02a6d82 100644
--- a/src/main/java/com/zy/asrs/entity/param/PickMatParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/PickMatParam.java
@@ -25,19 +25,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "";
+ private String standby1 = "1";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "";
+ private String standby2 = "1";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "";
+ private String standby3 = "1";
/**
* 澶囩敤1
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index aa3524e..27e99b4 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -39,19 +39,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "";
+ private String standby1 = "1";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "";
+ private String standby2 = "1";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "";
+ private String standby3 = "1";
/**
* 澶囩敤1
diff --git a/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java b/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
index a0b3a9e..2dc27e4 100644
--- a/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
+++ b/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
@@ -11,9 +11,9 @@
private String batch = "";
private String grade = "";
private String brand = "";
- private String standby1 = "";
- private String standby2 = "";
- private String standby3 = "";
+ private String standby1 = "1";
+ private String standby2 = "1";
+ private String standby3 = "1";
private String boxType1 = "1";
private String boxType2 = "1";
private String boxType3 = "1";
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
index 691e0b7..4f25588 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -94,7 +94,7 @@
wrkMastSta1.setStaEnd(1028);
break;
} else {
- wrkMastSta1.setStaEnd(2021);
+ wrkMastSta1.setStaEnd(2024);
break;
}
case 5:
diff --git a/src/main/java/com/zy/asrs/utils/ToSortLineUtils.java b/src/main/java/com/zy/asrs/utils/ToSortLineUtils.java
index f2b5c46..b4d5ad4 100644
--- a/src/main/java/com/zy/asrs/utils/ToSortLineUtils.java
+++ b/src/main/java/com/zy/asrs/utils/ToSortLineUtils.java
@@ -87,7 +87,7 @@
for (OptimizedLockerPacking3Utils.Locker locker:packingSolution.lockers) {
for (String mantnr : locker.contents.keySet()){
// System.out.println(mantnr+"<===>"+locker.contents.get(mantnr));
- String[] split = mantnr.split(Pattern.quote(sign_F));
+ String[] split = mantnr.split(Pattern.quote(sign_F),-1);
OrderToLine.MatList mat = new OrderToLine.MatList(
split[0], // matnr -> sku
split[1], // supp -> po -> s1
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2e8a1bf..fb3133a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -94,9 +94,9 @@
#璁℃椂鍣ㄤ笂鎶ュ紑鍏�
ErpReportOld: false
#鑾峰彇鍗曟嵁寮�鍏�
- InboundOrderSwitch: true
+ InboundOrderSwitch: false
#鐧诲綍鎺ュ彛寮�鍏�
- LoginAuthenticationSwitch: true
+ LoginAuthenticationSwitch: false
#涓婃姤銆佸鏍稿崟鎹紑鍏�
ReviewOrderSwitch: false
# 鍦板潃
diff --git a/src/main/resources/mapper/OrderDetlPakinMapper.xml b/src/main/resources/mapper/OrderDetlPakinMapper.xml
index 3f3e522..dd1fe9b 100644
--- a/src/main/resources/mapper/OrderDetlPakinMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakinMapper.xml
@@ -132,7 +132,7 @@
where 1=1
and order_id = #{orderId}
and matnr = #{matnr}
- <include refid="standbyAll"></include>
+<!-- <include refid="standbyAll"></include>-->
</select>
<select id="selectItemByOrderNo" resultMap="BaseResultMap">
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index b290e64..8d37cc8 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -10,8 +10,8 @@
<link rel="stylesheet" href="../static/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../static/css/loader.css" media="all">
- <link rel="stylesheet" href="../static/css/layx.min.css" type="text/css"/>
- <script src="../static/js/tools/layx.min.js"></script>
+<!-- <link rel="stylesheet" href="../static/css/layx.min.css" type="text/css"/>-->
+<!-- <script src="../static/js/tools/layx.min.js"></script>-->
<style>
.layui-logo img {
width: 25px;
--
Gitblit v1.9.1