From bb0b796649f1addc2bc593fb91fbb35b692ace8b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 19 四月 2024 15:50:11 +0800
Subject: [PATCH] 去除后台不需要的打印
---
north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java | 1 -
north-glass-erp/target/classes/mapper/pp/FolwCard.xml | 2 +-
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue | 12 ++++++------
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java | 1 -
north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java | 1 -
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 2 --
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 1 -
north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java | 4 ----
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 1 -
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 2 +-
10 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
index 64d6f39..a2083d3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
@@ -344,14 +344,14 @@
}
-footer {page-break-after: always;}
+/* 鍦� .footer 鍏冪礌鍚庡缁堟彃鍏ュ垎椤电 */
+@media print {
+ #contentTable {page-break-after: always;}
+}
-tbody{display:table-row-group;}
-table { page-break-inside:auto; }
-tr { page-break-inside:avoid; }
-td { page-break-inside:avoid; }
-thead { display:table-header-group; }
+thead { display:table-header-group;page-break-inside:avoid; }
+tbody { display:table-row-group;}
tfoot { display:table-footer-group;page-break-inside:avoid; }
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
index 37f9525..09ae89a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -168,7 +168,6 @@
@ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
@PostMapping("/getSelectPrinting")
public Result getSelectPrinting( @RequestBody Map<String,Object> object){
- System.out.println(object);
return Result.seccess(flowCardService.getSelectPrintingSv(object));
}
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
index 401705d..c5a4f39 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
@@ -198,7 +198,6 @@
public Map<String, Object> getSelectMaterialInventoryEngineering(Integer pageNum, Integer pageSize, OptimizeUse optimizeUse) {
Integer offset = (pageNum - 1) * pageSize;
- System.out.println(optimizeUse);
Map<String, Object> map = new HashMap<>();
map.put("data", materialInventoryMapper.getSelectMaterialInventoryEngineering(offset, pageSize, optimizeUse));
map.put("total", materialInventoryMapper.getSelectMaterialInventoryEngineeringPageTotal(offset, pageSize, optimizeUse));
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
index 611202c..b78390d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -126,7 +126,6 @@
patchMapper.updateReplenish(patchLog,userName);
ReportingWork reportingWork = reportingWorkMapper
.selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
- System.out.println(reportingWork.getReportingWorkId());
//淇敼灏忕墖娴佺▼鍗℃暟閲�
patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
index d14e3dc..5a24079 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
@@ -45,10 +45,8 @@
Customer customer = JSONObject.parseObject(JSONObject.toJSONString(object.get("customer")), Customer.class);
if(customer!=null){
if (customer.getId()!=null && customer.getId()!=0){
- System.out.println(111);
customerMapper.updateCustomer(customer);
}else{
- System.out.println(222);
customerMapper.insertCustomer(customer);
}
@@ -109,8 +107,6 @@
endDate = selectDate.get(1);
}
}
- System.out.println(orderDetail);
- System.out.println(orderDetail.getOrder());
Map<String, Object> map = new HashMap<>();
map.put("data", customerMapper.getSelectCustomerOderDate(offset, pageSize,startDate,endDate, orderDetail));
map.put("total", customerMapper.getSelectCustomerOderDatePageTotal(offset, pageSize,startDate,endDate, orderDetail));
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 c14a556..1473de8 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
@@ -77,7 +77,6 @@
endDate = selectDate.get(1);
}
}
- System.out.println(pageSize);
Map<String, Object> map = new HashMap<>();
map.put("data", deliveryDetailMapper.getSelectDeliveryDetailReport(offset, pageSize,startDate,endDate, deliveryDetail));
map.put("total", deliveryDetailMapper.getSelectDeliveryDetailReportPageTotal(offset, pageSize,startDate,endDate, deliveryDetail));
@@ -179,7 +178,6 @@
//鏂板鍙戣揣琛ㄦ暟鎹�
deliveryMapper.insertDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
}
- System.out.println(4);
Double area = 0.0;
Integer quantity = 0;
Double money = 0.0;
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
index d6b3f07..0d88662 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
@@ -50,7 +50,6 @@
JSONObject productJson = new JSONObject(productObject);
Product product = JSONObject.parseObject(JSONObject.toJSONString(productJson.get("title")), Product.class);
List<ProductDetail> productDetails = JSONArray.parseArray(JSONObject.toJSONString(productJson.get("detail")), ProductDetail.class);
- System.out.println(product);
//瀹屽杽涓婚檮琛ㄤ俊鎭苟杩斿洖
Map<String,Object> getProductJson = updateProduct(productDetails,product);
Product getProduct = JSONObject.parseObject(JSONObject.toJSONString(getProductJson.get("title")), Product.class);
diff --git a/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java b/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java
index 9e02bbb..e6907f2 100644
--- a/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java
+++ b/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java
@@ -37,7 +37,6 @@
//濡傛灉url鍖呭惈鍙傛暟锛岄渶瑕佸鐞�
if(uri.contains("?")){
String newUri=uri.substring(0,uri.indexOf("?"));
- System.out.println(newUri);
request.setUri(newUri);
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index d40be57..4e6b812 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -475,7 +475,7 @@
and fc.technology_number = #{technologyNumber}
group by fc.process_id, fc.order_number
order by fc.order_number
- limit 10
+ limit 15
</select>
<select id="getProcessList">
diff --git a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
index d40be57..4e6b812 100644
--- a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
@@ -475,7 +475,7 @@
and fc.technology_number = #{technologyNumber}
group by fc.process_id, fc.order_number
order by fc.order_number
- limit 10
+ limit 15
</select>
<select id="getProcessList">
--
Gitblit v1.8.0