From 494c68c9ad1cc3b085c27e87865269c4593c24e8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 25 十一月 2022 09:08:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WorkM/流转卡管理/MES_StationOutBill.cs |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs"
index 53f7bc5..80db201 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs"
@@ -87,6 +87,8 @@
                 txtHEmpID.Tag = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HItemID"]);
                 txtHEmpName.Text = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HName"]);
             }
+            txtHPersonNums.Text = "1";
+            txtHMachineNums.Text = "1";
         }
         //鍑虹珯鎸夐挳
         private void cmdOK_Click(object sender, EventArgs e)
@@ -428,6 +430,8 @@
             this.txtHWorkTimes.Text = BillOld.omodel.HWorkTimes.ToString();
             this.txtHMouldNum.Text = BillOld.omodel.HMouldNum.ToString();
             this.txtHSourceNameList.Text = BillOld.omodel.HSourceNameList.ToString();
+            this.txtHPersonNums.Text = BillOld.omodel.HPersonNums.ToString();
+            this.txtHMachineNums.Text = BillOld.omodel.HMachineNums.ToString();
             //鍔犺浇琛ㄤ綋
             initGrid();
             initGrid_Sub();
@@ -904,6 +908,8 @@
             BillNew.omodel.HWorkTimes = DBUtility.ClsPub.isSingle(this.txtHWorkTimes.Text);
             BillNew.omodel.HQCCheckID = DBUtility.ClsPub.isLong(this.txtHQCCheckID.Tag);
             BillNew.omodel.HSourceNameList = DBUtility.ClsPub.isStrNull(this.txtHSourceNameList.Text);
+            BillNew.omodel.HPersonNums = DBUtility.ClsPub.isLong(this.txtHPersonNums.Text);
+            BillNew.omodel.HMachineNums = DBUtility.ClsPub.isLong(this.txtHMachineNums.Text);
             //鏄庣粏绫昏祴鍊�
             BillNew.DetailColl = new List<Model.ClsSc_StationOutBillSub>();
             for (int i = 0; i <= grdSub.RowCount - 1; i++)

--
Gitblit v1.9.1