From ed3ce5c8f6e1f7ac1aad3218ab5e518fc95cdb0f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 10 九月 2024 10:26:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 2 +-
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue | 8 +++++++-
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 2 +-
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue | 6 ++++++
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 7 +++++--
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet5.vue | 5 +++++
6 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
index a6670b7..dab1008 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
@@ -322,6 +322,12 @@
height: 30px;
}
+@media print {
+ @page {
+ margin: 5mm 5mm 10mm 5mm;
+ }
+}
+
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet5.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet5.vue
index 5f37667..d99358b 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet5.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet5.vue
@@ -338,6 +338,11 @@
margin: 0;
padding: 0;
}
+@media print {
+ @page {
+ margin: 5mm 5mm 10mm 5mm;
+ }
+}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
index fa26ad2..628e4d1 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -133,7 +133,7 @@
<div id="entirety" v-for="(item,id) in labelList" >
<div class="row1">
- <div style="position: absolute;font-weight: bold;margin-left: 5px;" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
+ <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
<span>{{ item.customer_name }}</span>
<span>{{ item.order_id }}</span>
<span v-if="item.process.includes('澶硅兌')">鑳剁墖</span>
@@ -240,6 +240,12 @@
font-size: 10pt;
font-weight: bold;
}
+.cell{
+ position: absolute;
+ font-weight: bold;
+ margin-left: 5px;
+ margin-top: 0px;
+}
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 274855a..09bd8df 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -364,7 +364,7 @@
item=>item.grossArea === 0
)
const errorAreaList = $grid.getTableData().fullData.filter(
- item=>(item.width*item.height/1000000 < errorArea.value*1 && item.computeArea < errorArea.value*1)
+ item=>(item.width*item.height/1000000 < errorArea.value*1)
)
if(grossAreaList.length>0){
alert(t('order.msg.grossAreaIsNot0'))
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
index 6ba715d..8cf2442 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
@@ -150,8 +150,11 @@
}else{
throw new ServiceException(Constants.Code_600, "涓婂伐搴忓凡瀹屽伐鏁伴噺灏忎簬鏈伐搴忔姤宸ユ暟閲忥紝璇锋鏌�");
}
-
-
+ }
+ @ApiOperation("mes鎶ュ伐娆＄牬鏂板")
+ @PostMapping ("/mesSaveReportingWorkWorn")
+ public Result mesSaveReportingWorkWorn(@RequestBody Map<String,Object> reportingWork) {
+ return Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
}
}
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index 06e50a0..01d1242 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -554,7 +554,7 @@
<select id="getmaximum" >
- select count(*) from mm.finished_operate_log where operate_type =#{type} and date(operate_time)=CURDATE()
+ select count(*) from (select * from mm.finished_operate_log where operate_type =#{type} and date(operate_time)=CURDATE() group by operation_order_number) zu
</select>
<insert id="insertIntFinishedOperateLog" useGeneratedKeys="true" >
--
Gitblit v1.8.0