From c46cb6a71c35f38c7f23a2d01ad686f46a3d0e0b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 六月 2024 15:14:44 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 183 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 167 insertions(+), 16 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 0c07db1..69fe059 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -48,6 +48,7 @@
Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
List<OrderDetail> OrderDetails = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("detail")), OrderDetail.class);
List<OrderOtherMoney> orderOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("otherMoney")), OrderOtherMoney.class);
+
boolean saveState = true;
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
@@ -71,6 +72,49 @@
}
return saveState;
}
+
+ public boolean saveOrderTitle(Map<String,Object> orderMap) throws Exception {
+ JSONObject orderJson = new JSONObject(orderMap);
+ Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
+
+ boolean saveState = true;
+ //璁剧疆鍥炴粴鐐�
+ Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+ //鍒ゆ柇浼犲叆id鍙傛暟鏄惁涓虹┖锛屾湭浼犲叆id涓虹┖鎻掑叆璁㈠崟琛紝浼犲叆鏇存柊琛�
+ try{
+ LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(Order::getOrderId, order.getOrderId());
+ orderMapper.update(order,updateWrapper);
+ //淇敼璁㈠崟涓昏〃闈㈢Н涓庡懆闀夸互鍙婇噸閲�
+ orderMapper.updateOrderParameter(order.getOrderId());
+
+ }catch (Exception e){
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ //灏嗗紓甯镐紶鍏ユ暟鎹簱
+ SysError sysError = new SysError();
+ sysError.setError(e.toString());
+ sysError.setFunc("saveOrder");
+ sysErrorService.insert(sysError);
+ saveState = false;
+
+ //throw new Exception();
+ }
+ return saveState;
+ }
+
+
+ public Map<String,Object> selectOrder(Map<String,Object> orderMap) throws Exception {
+ JSONObject orderJson = new JSONObject(orderMap);
+ Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
+ Map<String,Object> map = new HashMap<>();
+ if(order.getOrderId()!=null && !order.getOrderId().isEmpty()){
+ map.put("data",0);
+ }else{
+ map.put("data",orderMapper.selectOrder(order));
+ }
+
+ return map;
+ }
//鐢熸垚璁㈠崟鏁版嵁
public void insertOrder(Order order,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) {
Integer maxOrderId = orderMapper.selectMaxOrderId();
@@ -85,7 +129,9 @@
order.setOrderId(orderId);
order.setCreateOrder(2);
orderMapper.insert(order);
+
insertOtherDetail(orderId,OrderDetails,orderOtherMoneyList);
+
}
//淇敼璁㈠崟鏁版嵁锛屽苟涓旈噸鏂扮敓鎴愬涓壇琛ㄦ暟鎹�
@@ -93,21 +139,23 @@
LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Order::getOrderId, order.getOrderId());
orderMapper.update(order,updateWrapper);
- //鍒犻櫎璁㈠崟鏄庣粏琛�
- orderDetailMapper.delete(new LambdaQueryWrapper<OrderDetail>().eq(OrderDetail::getOrderId, order.getOrderId()));
- //鍒犻櫎璁㈠崟灏忕墖琛�
- orderGlassDetailMapper.delete(new LambdaQueryWrapper<OrderGlassDetail>().eq(OrderGlassDetail::getOrderId, order.getOrderId()));
- //鍒犻櫎鍏朵粬閲戦鏄庣粏琛�
- orderOtherMoneyMapper.delete(new LambdaQueryWrapper<OrderOtherMoney>().eq(OrderOtherMoney::getOrderId, order.getOrderId()));
+ //鍒犻櫎璁㈠崟鏄庣粏琛�
+ orderDetailMapper.delete(new LambdaQueryWrapper<OrderDetail>().eq(OrderDetail::getOrderId, order.getOrderId()));
+ //鍒犻櫎璁㈠崟灏忕墖琛�
+ orderGlassDetailMapper.delete(new LambdaQueryWrapper<OrderGlassDetail>().eq(OrderGlassDetail::getOrderId, order.getOrderId()));
+ //鍒犻櫎鍏朵粬閲戦鏄庣粏琛�
+ orderOtherMoneyMapper.delete(new LambdaQueryWrapper<OrderOtherMoney>().eq(OrderOtherMoney::getOrderId, order.getOrderId()));
- //鍒犻櫎璁㈠崟宸ヨ壓琛�
- // orderProcessDetailMapper.delete(new LambdaQueryWrapper<OrderProcessDetail>().eq(OrderProcessDetail::getOrderId, order.getOrderId()));
- insertOtherDetail(order.getOrderId(),OrderDetails,orderOtherMoneyList);
+
+ //鍒犻櫎璁㈠崟宸ヨ壓琛�
+ // orderProcessDetailMapper.delete(new LambdaQueryWrapper<OrderProcessDetail>().eq(OrderProcessDetail::getOrderId, order.getOrderId()));
+ insertOtherDetail(order.getOrderId(),OrderDetails,orderOtherMoneyList);
}
//鎻掑叆鍏朵粬鍓〃鏁版嵁锛岃鍏朵粬鏂规硶寮曠敤
public void insertOtherDetail(String orderId,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) {
+
//鍏堟妸鍏朵粬閲戦鍓〃鐨勯噾棰濅笌鏁伴噺缃�0
orderOtherMoneyList.forEach(orderOtherMoney -> {
orderOtherMoney.setQuantity(0.0);
@@ -117,18 +165,28 @@
for (int i = 0; i < OrderDetails.size(); i++) {
OrderDetails.get(i).setOrderNumber(i+1);
OrderDetails.get(i).setOrderId(orderId);
- OrderDetails.get(i).setPerimeter(OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()*2/1000);
+ OrderDetails.get(i).setPerimeter((OrderDetails.get(i).getWidth()+OrderDetails.get(i).getHeight())*2/1000);
OrderDetails.get(i).setWeight(1.0);
- Map<String,Double> otherColumns = JSON.parseObject(OrderDetails.get(i).getOtherColumns(), new TypeReference<Map<String, Double>>(){});
- int finalI = i;
+ if(OrderDetails.get(i).getBendRadius()!=null && OrderDetails.get(i).getBendRadius()!=0){
+ //鑾峰彇寮挗寮у害
+ Double bendRadius = OrderDetails.get(i).getBendRadius();
+ //鑾峰彇瀹�
+ Double width = OrderDetails.get(i).getWidth();
+ //鑾峰彇鎷遍珮
+ String archRiseS = String.format("%.1f",bendRadius-(bendRadius*Math.cos(width/2/bendRadius)));
+ Double archRise = Double.parseDouble(archRiseS);
+ OrderDetails.get(i).setArchRise(archRise);
+ }
+ Map<String,Object> otherColumns = JSON.parseObject(OrderDetails.get(i).getOtherColumns(), new TypeReference<Map<String, Object>>(){});
+ int finalI = i;
if(otherColumns!=null){
otherColumns.forEach((key, value) ->{
- if(value!=null) {
+ if(value!=null && key.contains("M")) {
orderOtherMoneyList.forEach(orderOtherMoney -> {
if (orderOtherMoney.getColumn().equals(key)) {
- orderOtherMoney.setQuantity(orderOtherMoney.getQuantity()+(value * OrderDetails.get(finalI).getQuantity()));
+ orderOtherMoney.setQuantity(orderOtherMoney.getQuantity()+(Double.parseDouble((String) value) * OrderDetails.get(finalI).getQuantity()));
}
});
}
@@ -222,12 +280,16 @@
return map;
}
//璁㈠崟瀹℃牳
- public boolean reviewOrderById(String id,Integer status) {
+ public boolean reviewOrderById(String id, Integer status, String userId, String userName) {
Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
if(order.getProcessReview()!=2){
throw new ServiceException(Constants.Code_600,"璇ヨ鍗曡繕鏈鏍�");
+ }else if(status==0){
+ return orderMapper.reviewOrderByIds(id,status,userId,userName);
+ }else{
+ return orderMapper.reviewOrderById(id,status,userId,userName);
}
- return orderMapper.reviewOrderById(id,status);
+
}
//宸ヨ壓瀹℃牳鐣岄潰瀹℃牳鏇存柊鏁版嵁
public boolean reviewProcessById(String id, Integer status,List<OrderGlassDetail> orderGlassDetails) {
@@ -343,4 +405,93 @@
public List<OrderDTO> exportOrderProductSummary(List<LocalDate> dates) {
return orderDetailMapper.exportOrderProductSummary(dates);
}
+
+ public Map<String,String> getOrderProductDetailTag(String orderId) {
+ return orderDetailMapper.getOrderProductDetailTag(orderId);
+ }
+
+ public List<OrderDetail> getOrderDetailById(String id) {
+ return orderDetailMapper.selectList(new QueryWrapper<OrderDetail>().eq("order_id",id));
+ }
+
+ public List<OrderGlassDetail> getOrderCraftDetailById(String id) {
+ return orderGlassDetailMapper.selectOrderGlassDetailByOrderId(id);
+ }
+
+ public Object printOrderProductDetail(String orderId) {
+ List<Map<String,Object>> orderProductDistinct = orderDetailMapper.getOrderProductDistinctById(orderId);
+
+ List<Map<String,Object>> orderProductDetail = new ArrayList<>();
+ orderProductDistinct.forEach(map->{
+ Map<String,Object> orderProductDetailMap = new HashMap<>();
+ orderProductDetailMap.put("productId",map.get("productId"));
+ orderProductDetailMap.put("productName",map.get("productName"));
+ List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
+ orderDetails.forEach(orderDetail->{
+
+ orderDetail.setGrossArea(
+ Double.parseDouble(String.format("%.3f",Double.parseDouble(
+ String.format("%.3f",
+ orderDetail.getWidth()*orderDetail.getHeight()/1000000)
+ ) * orderDetail.getQuantity()))
+ );
+ });
+
+ orderProductDetailMap.put("productDetail",orderDetails);
+ orderProductDetail.add(orderProductDetailMap);
+ });
+
+ Map<String,Object> returns = new HashMap<>();
+
+ returns.put("orderProductDetail",orderProductDetail);
+ returns.put("order",orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",orderId)));
+ return returns;
+ }
+
+ public Object printOrderProductGlassDetail(String orderId) {
+ Map<String,Object> returns = new HashMap<>();
+ returns.put("order",orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",orderId)));
+
+ List<Map<String,Object>> orderProductDistinct = orderDetailMapper.getOrderProductDistinctById(orderId);
+ List<Map<String,Object>> orderProductDetail = new ArrayList<>();
+ orderProductDistinct.forEach(map->{
+ Map<String,Object> orderProductDetailMap = new HashMap<>();
+ orderProductDetailMap.put("productId",map.get("productId"));
+ orderProductDetailMap.put("productName",map.get("productName"));
+ List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
+ orderDetails.forEach(orderDetail->{
+ orderDetail.setGrossArea(
+ Double.parseDouble(String.format("%.3f",Double.parseDouble(
+ String.format("%.3f",
+ orderDetail.getWidth()*orderDetail.getHeight()/1000000)
+ ) * orderDetail.getQuantity()))
+ );
+
+ List<OrderGlassDetail> orderGlassDetails =
+ orderGlassDetailMapper.selectList(
+ new QueryWrapper<OrderGlassDetail>().
+ eq("order_id",orderId).
+ eq("order_number",orderDetail.getOrderNumber())
+ );
+ Integer differentSize = orderGlassDetailMapper.getDifferentSizeNumber(orderId,orderDetail.getOrderNumber());
+ orderDetail.setDifferentSize(differentSize);
+ orderDetail.setOrderGlassDetails(orderGlassDetails);
+ });
+
+ orderProductDetailMap.put("productDetail",orderDetails);
+ orderProductDetail.add(orderProductDetailMap);
+ });
+ returns.put("orderDetail",orderProductDetail);
+
+
+
+
+
+
+
+ return returns;
+
+
+
+ }
}
--
Gitblit v1.8.0