From a905b3df0d0c9ae045b51d1299fbb2f2dcbc2e2d Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 21 二月 2022 10:14:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 PlanM/计划管理/Gy_RoutingBill.cs |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs" "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs"
index 613641e..14e6889 100644
--- "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs"
+++ "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs"
@@ -844,6 +844,12 @@
             this.txtHAddSourceRate.Text = BillOld.omodel.HAddSourceRate.ToString();
             this.txtHDelSourceRate.Text = BillOld.omodel.HDelSourceRate.ToString();
 
+            this.textHPicNumVer.Text = BillOld.omodel.HPicNumVer.ToString();
+            this.textHPicNumAssemble.Text = BillOld.omodel.HPicNumAssemble.ToString();
+            this.textHMaterTexture.Text = BillOld.omodel.HMaterTexture.ToString();
+            this.textHProductNum.Text = BillOld.omodel.HProductNum.ToString();
+            this.textHVerNum.Text = BillOld.omodel.HVerNum.ToString();
+
             //鍔犺浇琛ㄤ綋
             int i = 0;
             foreach (Model.ClsGy_RoutingBillSub oSub in BillOld.DetailColl)
@@ -1036,6 +1042,7 @@
             if (BillStatus ==DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
                 BillNew.omodel.HInterID = BillOld.omodel.HInterID;
             //涓荤被璧嬪��
+            BillNew.omodel.HPRDORGID = DBUtility.ClsPub.HOrgID;  //缁勭粐
             BillNew.omodel.HYear = 2011;
             BillNew.omodel.HPeriod = 1;
             BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();  //鍦ㄨ祴鍊肩被鍓嶅氨澶勭悊濂藉瓧绗︿覆鍜屾暟瀛�
@@ -1571,6 +1578,8 @@
                                     grdMain.Rows[sRow].Cells[HProcNameCol].Value = oProc.oModel.HName;
                                     grdMain.Rows[sRow].Cells[HTimeUnitCol].Value = "灏忔椂";
                                     grdMain.Rows[sRow].Cells[HUnitTimeCol].Value = "1";
+                                    grdMain.Rows[sRow].Cells[HPassRateCol].Value = "100";
+                                    grdMain.Rows[sRow].Cells[HWorkQtyCol].Value = "1";
                                     if (oProc.GetInfoByID(oProc.oModel.HItemID))
                                     {
                                         grdMain.Rows[sRow].Cells[HProcCheckNoteCol].Value = oProc.omodel.HProcCheckNote.ToString();

--
Gitblit v1.9.1