From f0957ff7692bbf4f721121ed695df01f4c6d640d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 四月 2024 09:37:11 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original | 0
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 4 ++--
north-glass-erp/target/classes/mapper/pp/PatchLogMapper.xml | 3 ++-
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 3 ++-
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 1 +
5 files changed, 7 insertions(+), 4 deletions(-)
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 bdeb76c..2a5597d 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
@@ -88,8 +88,8 @@
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true,gt:15 },//寮�鍚櫄鎷熸粴鍔�
- scrollX:{ enabled: true,gt:30 },//寮�鍚櫄鎷熸粴鍔�
+ scrollY:{ enabled: true,gt:13 },//寮�鍚櫄鎷熸粴鍔�
+ //scrollX:{ enabled: true,gt:15 },//寮�鍚櫄鎷熸粴鍔�
showOverflow:true,
menuConfig: {
body: {
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 b78390d..ad1787d 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,6 +126,7 @@
patchMapper.updateReplenish(patchLog,userName);
ReportingWork reportingWork = reportingWorkMapper
.selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
+ System.out.println(patchLog);
//淇敼灏忕墖娴佺▼鍗℃暟閲�
patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
index 7c1cd65..6ee617b 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
@@ -22,7 +22,7 @@
o.batch,
od.building_number,
od.product_name,
- ogd.technology_number,
+ r.technology_number,
ogd.glass_address,
r.patch_num,
od.width,
@@ -88,6 +88,7 @@
update pp.patch_log set reviewer=#{userName},review_status=1,update_time=now() where id=#{patchLog.id}
</update>
+
<update id="updateOrderProcessDetail" >
update sd.order_process_detail
set reporting_work_num=reporting_work_num - #{patchLog.patchNum}
diff --git a/north-glass-erp/target/classes/mapper/pp/PatchLogMapper.xml b/north-glass-erp/target/classes/mapper/pp/PatchLogMapper.xml
index 7c1cd65..6ee617b 100644
--- a/north-glass-erp/target/classes/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/target/classes/mapper/pp/PatchLogMapper.xml
@@ -22,7 +22,7 @@
o.batch,
od.building_number,
od.product_name,
- ogd.technology_number,
+ r.technology_number,
ogd.glass_address,
r.patch_num,
od.width,
@@ -88,6 +88,7 @@
update pp.patch_log set reviewer=#{userName},review_status=1,update_time=now() where id=#{patchLog.id}
</update>
+
<update id="updateOrderProcessDetail" >
update sd.order_process_detail
set reporting_work_num=reporting_work_num - #{patchLog.patchNum}
diff --git a/north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original b/north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original
index e08b1c3..2f998ae 100644
--- a/north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original
+++ b/north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original
Binary files differ
--
Gitblit v1.8.0