From dc14adea989a5b7f4ebfeb3b107896cba2886ce1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com>
Date: Fri, 15 Nov 2024 16:20:36 +0800
Subject: [PATCH] 1

---
 shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs | 2 +-
 shangjian/XGLFinishPro/Views/LanJu_Operator.xaml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
index b6c601a..6c6be3a 100644
--- a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
+++ b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
@@ -831,7 +831,7 @@ where line_code = '{deviceCode}' and CONVERT(VARCHAR(10), Create_time , 120) = C
         /// </summary>
         /// <param name="item"></param>
         /// <exception cref="NotImplementedException"></exception>
-        public string GetCreateUnitPriceInfo(sys_user item, string workorderCode, string sapWorkorderCode, string productCode, string productName, string childProcessCode, string childProcessName, string deviceCode, string number, string credata, string attr2, string post,string attr3="", decimal total = 0)
+        public string GetCreateUnitPriceInfo(sys_user item, string workorderCode, string sapWorkorderCode, string productCode, string productName, string childProcessCode, string childProcessName, string deviceCode, string number, string credata, string attr2, string post, string attr3 = "", decimal total = 0)
         {
             string sql = $@"INSERT INTO [dbo].[mes_unitprice_report] (
 	                                [id],[workorder_code], [workorder_code_sap], [product_name], [product_code],
diff --git a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml
index b767927..d8ade7f 100644
--- a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml
+++ b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml
@@ -542,7 +542,6 @@ Background="#F2F3F5"
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
                 <!--<DataGridTextColumn Width="60" Header="母单" Binding="{Binding parent_order,Converter={StaticResource ParentOrderConverter}}"/>-->
-                <DataGridTextColumn Width="200" Header="SAP工单" Binding="{Binding workorder_code_sap}"/>
                 <DataGridTemplateColumn Header="状态" Width="100">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
@@ -552,6 +551,7 @@ Background="#F2F3F5"
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
+                <DataGridTextColumn Width="200" Header="SAP工单" Binding="{Binding workorder_code_sap}"/>
                 <!--<DataGridTextColumn Width="120" Header="RFID" Binding="{Binding rfid}"/>-->
                 <DataGridTextColumn Width="480" Header="产品名称" Binding="{Binding product_name}" />
                 <DataGridTextColumn Width="320" Header="批次号" Binding="{Binding batch_code}" />