From a04d735ab3f2e9c52ebf52c35dfa1506d86d416d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 24 七月 2025 17:01:57 +0800
Subject: [PATCH] 修改流程卡打印获取第一个工序不正确问题，在制品汇总报表添加批次
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 a5f4044..b4a90bf 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
@@ -291,9 +291,8 @@
OrderDetails.get(i).setOtherColumns("{}");
}
- if(OrderDetails.get(i).getFileName()!=null){
+ if(OrderDetails.get(i).getFileName()!=null&&!OrderDetails.get(i).getFileName().trim().isEmpty()){
orderMapper.saveOrderFile(OrderDetails.get(i).getFileName(), OrderDetails.get(i).getFileData(),orderId,OrderDetails.get(i).getOrderNumber());
- OrderDetails.get(i).setFileData(null);
}
}
@@ -423,12 +422,14 @@
Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
List<OrderDetail> orderDetails = orderDetailMapper.selectList(new QueryWrapper<OrderDetail>().eq("order_id",id));
List<OrderOtherMoney> orderOtherMoneyList = orderOtherMoneyMapper.findById(id);
+ List<Map<String,String>> orderFileList = orderMapper.selectOrderFileList(id);
Map<String,Object> map = new HashMap<>();
map.put("order",order);
map.put("orderDetails",orderDetails);
map.put("orderOtherMoneyList",orderOtherMoneyList);
+ map.put("orderFile",orderFileList);
return map;
}
//璁㈠崟瀹℃牳
@@ -1010,4 +1011,26 @@
map.put("data",orderMapper.selectOrderFile(orderId,orderNumber));
return map;
}
+
+ public boolean updateOrderFile(Map<String,Object> object) {
+ String orderId = "";
+ if (object.get("orderId") != null) {
+ orderId = object.get("orderId").toString();
+ }
+ int orderNumber =0;
+ if (object.get("orderNumber") != null) {
+ orderNumber = Integer.parseInt(object.get("orderNumber").toString());
+ }
+ String dataBase64 = "";
+ if (object.get("dataBase64") != null) {
+ dataBase64 = object.get("dataBase64").toString();
+ }
+ Map<String,String> orderFile =orderMapper.selectOrderFile(orderId,orderNumber);
+ if(orderFile!=null){
+ orderMapper.updateOrderFile("map.dxf", dataBase64,orderId,orderNumber);
+ }else{
+ orderMapper.saveOrderFile("map.dxf", dataBase64,orderId,orderNumber);
+ }
+ return true;
+ }
}
--
Gitblit v1.8.0