From 0066150978efa004da69e580390a021ebef1824e Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期三, 25 六月 2025 17:06:41 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java | 16 +++++++++++-----
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/BatchMergeOrdersParam.java | 2 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 3 ++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java | 8 ++++----
4 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
index cce5d1a..c1c4935 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.wms.asrs.entity.dto.OrderInfoDto;
import com.zy.asrs.wms.asrs.entity.dto.PickSheetDetlDto;
import com.zy.asrs.wms.asrs.entity.dto.ShippingOrderDetlDto;
+import com.zy.asrs.wms.asrs.entity.enums.OrderType;
import com.zy.asrs.wms.asrs.entity.param.BatchMergeOrdersParam;
import com.zy.asrs.wms.asrs.entity.param.PakinOnShelvesParams;
import com.zy.asrs.wms.asrs.service.MobileService;
@@ -174,6 +175,12 @@
}
+ /**
+ * @author Ryan
+ * @date 2025/6/25
+ * @description: 缁勬墭
+ * @version 1.0
+ */
@PostMapping("/comb/auth")
public R combMats(@RequestBody BatchMergeOrdersParam ordersParam) {
if (StringUtil.isNullOrEmpty(ordersParam.getOrderNo())) {
@@ -187,11 +194,13 @@
}
String str = ordersParam.getMergeNo().trim();
- // CUT搴撴潯鐮乀寮�澶达紝鎴彇鍚�10浣�
+ // CTU搴撴潯鐮乀寮�澶达紝鎴彇鍚�10浣�
if (str.charAt(0) == 'T') {
ordersParam.setMergeNo(str.substring(str.length() - 10));
}
-
+ if (str.startsWith("PK")) {
+ ordersParam.setInType(OrderType.PK_IN_ORDER.id);
+ }
boolean result = mobileService.batchMergeOrders(ordersParam);
if (result) {
return R.ok("缁勬墭鎴愬姛锛侊紒");
@@ -295,7 +304,4 @@
}
return mobileService.confirmShippingDetl(params);
}
-
-
-
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/BatchMergeOrdersParam.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/BatchMergeOrdersParam.java
index 3557ec3..87dcc8b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/BatchMergeOrdersParam.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/BatchMergeOrdersParam.java
@@ -13,6 +13,8 @@
private String orderNo;
/**瀹瑰櫒缂栫爜*/
private String mergeNo;
+ /**鍏ュ簱绫诲瀷锛� 骞冲簱锛� CTU搴�*/
+ private Long inType;
/**闇�缁勬墭鍚堝苟璁㈠崟鏄庣粏*/
private List<OrderInfoDto> orderDetls;
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
index 555f5e6..ec41b71 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
@@ -117,8 +117,9 @@
waitPakinService.comb(pakin);
});
+
// UTC鍏ュ簱鍗曟嵁(闈炲钩搴撳叆搴撳崟鎹�)
- if (order.getOrderType() != OrderType.PK_IN_ORDER.id) {
+ if (!ordersParam.getInType().equals(OrderType.PK_IN_ORDER.id)) {
/*** 椤圭洰涓嬪彂娴佺▼ * 1. PDA缁勬嫋閫氱煡妗�* 2. 鐢熸垚浠诲姟妗�* 3. 閫氳繃瀹氭椂浠诲姟涓嬪彂鑷矱SS** */
//鐢熸垚浠诲姟妗�
GeneratePakInParam generatePakInParam = new GeneratePakInParam();
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java
index c12db65..fddb14f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java
@@ -44,10 +44,10 @@
StringBuffer buffer = new StringBuffer();
buffer.append(orderNoRule.getOrderConst());//璁㈠崟甯搁噺
- String pattern = "yyyyMMddHHmmss";
- if (orderNoRule.getTimeRule() == 0) {
- pattern = "yyyyMMdd";
- }
+ String pattern = "yyMMddHHmmss";
+// if (orderNoRule.getTimeRule() == 0) {
+// pattern = "yyyyMMdd";
+// }
SimpleDateFormat format = new SimpleDateFormat(pattern);
buffer.append(format.format(new Date()));//璁㈠崟鏃堕棿
--
Gitblit v1.9.1