From 39639216e7c25789d3c195b40cdd698bc33f5614 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 02 八月 2024 13:47:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index 80443e2..dbc234f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -168,6 +168,7 @@
} else {
deliveryId = "";
}
+ String deliveryIdType = object.get("deliveryIdType").toString();
Delivery delivery = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), Delivery.class);
List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("delivery")), OrderDetail.class);
List<DeliveryOtherMoney> deliveryOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(object.get("otherMoney")), DeliveryOtherMoney.class);
@@ -206,7 +207,7 @@
deliveryMapper.updateDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
} else {
//鑾峰彇鍗曞彿
- oddNumber = orderNumberSetting("鍙戣揣");
+ oddNumber = orderNumberSetting("鍙戣揣",deliveryIdType);
//鏂板鍙戣揣琛ㄦ暟鎹�
deliveryMapper.insertDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
}
@@ -738,21 +739,34 @@
}
}
- public String orderNumberSetting(String type) {
+ public String orderNumberSetting(String type,String deliveryIdType) {
//鏍规嵁绫诲瀷鑷姩鐢熸垚涓嶅悓鐨勬搷浣滃崟鍙�
String alias="";
if(Objects.equals(type, "鍙戣揣")){
alias="FH";
}
- //鏌ヨ褰撳ぉ鐨勬渶澶ф暟閲�
- Integer maximum=deliveryMapper.getmaximum(type);
- //璁剧疆涓や綅涓嶅琛�0
- String formattedNumber = String.format("%02d", maximum+1);
- //鏍煎紡鍖栧綋鍓嶆棩鏈�
- Date currentDate = new Date();
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
- String formattedDate = dateFormat.format(currentDate);
- String oddNumbers = alias+formattedDate+formattedNumber;
+ String oddNumbers="";
+
+ if(deliveryIdType.equals("day")){
+ //鏌ヨ褰撳ぉ鐨勬渶澶ф暟閲�
+ Integer maximum=deliveryMapper.getmaximum(type);
+ //璁剧疆涓や綅涓嶅琛�0
+ String formattedNumber = String.format("%02d", maximum+1);
+ //鏍煎紡鍖栧綋鍓嶆棩鏈�
+ Date currentDate = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
+ String formattedDate = dateFormat.format(currentDate);
+ oddNumbers = alias+formattedDate+formattedNumber;
+ }else if(deliveryIdType.equals("month")){
+ Integer maximum = deliveryMapper.getmaximumMonth();
+ String formattedNumber = String.format("%04d", maximum+1);
+ Date currentDate = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyMM");
+ String formattedDate = dateFormat.format(currentDate);
+ oddNumbers = alias+formattedDate+formattedNumber;
+
+ }
+
return oddNumbers;
}
}
--
Gitblit v1.8.0