From d80907cd2f96c99bb8875cba6b20f26306c88812 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 23 二月 2024 13:39:28 +0800
Subject: [PATCH] 前端筛选，发货界面的复选框显示修改
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 10 +++-------
1 files changed, 3 insertions(+), 7 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 aa5c61e..0bb5ee6 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
@@ -59,7 +59,6 @@
Integer offset = (pageNum - 1) * pageSize;
Map<String, Object> map = new HashMap<>();
- System.out.println(orderDetail.getDeliveryDetail().getMoney());
map.put("data", deliveryDetailMapper.getseletShippingOrderDetail(offset, pageSize, orderDetail));
map.put("delivery", deliveryMapper.getseletShippingOrderDetaildelivery(offset, pageSize, orderDetail));
map.put("total", deliveryDetailMapper.getseletShippingOrderDetailPageTotal(offset, pageSize, orderDetail));
@@ -104,7 +103,6 @@
List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("delivery")), OrderDetail.class);
//鑾峰彇鍗曞彿
String oddNumber= orderNumberSetting("鍙戣揣");
- System.out.println(delivery);
deliveryMapper.insertDelivery(delivery,oddNumber,orderDetaillist.get(0).getOrderId());
Double area=0.0;
Integer quantity=0;
@@ -117,15 +115,14 @@
area+=orderDetail.getFinishedGoodsInventory().getActualSignalArea()*orderDetail.getDeliveryDetail().getQuantity();
money+=orderDetail.getPrice()*orderDetail.getDeliveryDetail().getQuantity();
Integer deliveryDetailmaximum=deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber);
- System.out.println(deliveryDetailmaximum);
- deliveryDetailMapper.insertDeliveryDetail(orderDetail,oddNumber,deliveryDetailmaximum);
+ deliveryDetailMapper.insertDeliveryDetail(orderDetail,oddNumber,deliveryDetailmaximum+1);
deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
//淇敼搴撳瓨琛ㄥ嚭搴撴暟閲�
finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(),orderDetail.getOrderNumber(),orderDetail.getDeliveryDetail().getQuantity());
isinsert=true;
}
- System.out.println("闈㈢Н"+area+"鏁伴噺"+quantity+"閲戦"+money);
- deliveryMapper.updatedelivery(area,quantity,money,oddNumber);
+
+ deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)),quantity,Double.valueOf(String.format("%.2f", money)),oddNumber);
return isinsert;
}else{
return false;
@@ -147,7 +144,6 @@
type = Integer.parseInt(object.get("type").toString());
}
- System.out.println(deliveryId);
deliveryMapper.updateDeliveryToExamine(deliveryId,type);
return true;
--
Gitblit v1.8.0