成品界面添加批次信息展示

shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs

@@ -485,10 +485,11 @@ select  a.TrayCode,a.ProductBarNo,a.carcode,a.createtime,a.lineno,b.HadNumber
         public DataTable GetWetPlanInfo(string deviceCode, string date)
         {
             string sql = $@"select workorder.factory_code,workorder.product_date as plan_time, workorder.workorder_id,workorder.workorder_code, product_code,product_name,
-product_spc,shifts.shift_desc,prod_line_code,workorder.status,route_code,quantity_split,unit,workorder.shift_id 
+product_spc,shifts.shift_desc,prod_line_code,workorder.status,route_code,quantity_split,unit,workorder.shift_id ,batch.batch_code,batch.batch_quantity
 from  pro_order_workorder workorder 
 left JOIN base_shifts_t shifts on workorder.shift_id = shifts.shift_id
-where 1=1 and 
+left JOIN pro_order_workorder_batch batch on workorder.workorder_id = batch.workorder_id  
+where 1=1 and batch.del_flag = 0 and workorder.del_flag = 0 and 
  workorder.parent_order ='0' and CONVERT(VARCHAR(10), workorder.product_date , 120)= CONVERT(VARCHAR(10), '{date}' , 120) and workorder.prod_line_code like '%{deviceCode}%'";
             DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
             if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)

shangjian/XGLFinishPro/Views/LanJu_Operator.xaml

@@ -450,6 +450,8 @@
                 <!--<DataGridTextColumn Width="140" Header="工单完成数" Binding="{Binding attr1}" />
                 <DataGridTextColumn Width="180" Header="当前机台完成数" Binding="{Binding totalCount}" />-->
                 <DataGridTextColumn Width="180" Header="班次" Binding="{Binding shift_desc}" />
+                <DataGridTextColumn Width="180" Header="批次号" Binding="{Binding batch_code}" />
+                <DataGridTextColumn Width="180" Header="批次数量" Binding="{Binding batch_quantity}" />
                 <!--<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />-->
                 <!--<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>-->