From f701aee5b2d813126953767f4e962abb2a6b45bd Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 09 七月 2024 16:33:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue | 1 +
north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml | 2 ++
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue | 3 ++-
3 files changed, 5 insertions(+), 1 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 afe1ff1..53fba6d 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
@@ -181,9 +181,10 @@
</thead>
<tr style="border-style: none">
<td style="font-size: 15px;font-weight: bold;text-align: left" colspan="9">
- 浜у搧鍚嶇О:<span>{{data.orderProductDetail[index].productName}}</span>
+ 浜у搧鍚嶇О:<span>{{item.productName}}</span>
</td>
</tr>
+
<tr class="day-in" v-for="(items, index1) in item.productDetail" :key="index1">
<td>{{items.orderNumber}}</td>
<td>{{items.buildingNumber}}</td>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index 3c1e5c7..3fc370d 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -259,6 +259,7 @@
{field: 'orderDetail.grossArea', title: t('order.grossArea'), width: 70},
{field: 'orderDetail.quantity', title: t('order.quantity'),},
{field: 'order.creator', title: t('order.creator'),},
+ {field: 'founder', title: t('product.creator'),},
],//琛ㄥご鎸夐挳
data: null,//琛ㄦ牸鏁版嵁
toolbarConfig: {
diff --git a/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml b/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
index ec4be7e..7a9049e 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
@@ -8,6 +8,7 @@
<result column="order_id" property="orderId"/>
<result column="production_id" property="productionId"/>
<result column="splitting_status" property="splittingStatus"/>
+ <result column="founder" property="founder"/>
<result column="create_time" property="createTime"/>
<!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
<result column="batch" property="order.batch"/>
@@ -78,6 +79,7 @@
o.order_id,
od.order_number,
ogd.production_id,
+ ogd.founder,
o.batch,
o.project,
o.order_type,
--
Gitblit v1.8.0