From da1bf9f968a95b773b0dff98b45197dc80c7ae63 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期六, 29 六月 2024 16:24:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 DAL/车间管理/ClsSc_MaterToSourceBill.cs |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_MaterToSourceBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_MaterToSourceBill.cs"
index 2dfc622..fef4650 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_MaterToSourceBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_MaterToSourceBill.cs"
@@ -122,6 +122,7 @@
                 ",HWorkerID=" + omodel.HWorkerID.ToString() +
                 ",HWorkerBarCode='" + omodel.HWorkerBarCode + "'" +
                 ",HGroupID=" + omodel.HGroupID.ToString() +
+                ",HProcNo=" + omodel.HProcNo.ToString() +
                 ",HMainSourceInterID='" + omodel.HMainSourceInterID.ToString() + "'" +
                 ",HMainSourceEntryID='" + omodel.HMainSourceEntryID.ToString() + "'" +
                 ",HMainSourceBillNo='" + omodel.HMainSourceBillNo + "'" +
@@ -196,14 +197,14 @@
                 ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
                 ",HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HICMOInterID,HICMOEntryID,HICMOBillNo" +
                 ",HSourceID,HProcID,HMaterID,HSourceBarCode,HEquipID,HWorkerID,HWorkerBarCode" +
-                ",HGroupID,HStockOrgID" +
+                ",HGroupID,HProcNo,HStockOrgID" +
                 ") " +
                 " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" +
                 ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                 "," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
                 "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() + ",'" + omodel.HProcExchBillNo + "'," + omodel.HICMOInterID.ToString() + "," + omodel.HICMOEntryID.ToString() + ",'" + omodel.HICMOBillNo + "'" +
                 "," + omodel.HSourceID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HMaterID.ToString() + ",'" + omodel.HSourceBarCode + "'," + omodel.HEquipID.ToString() + "," + omodel.HWorkerID.ToString() + ",'" + omodel.HWorkerBarCode + "'" +
-                "," + omodel.HGroupID.ToString() +"," + omodel.HSTOCKORGID.ToString() +
+                "," + omodel.HGroupID.ToString() + "," + omodel.HProcNo.ToString() + "," + omodel.HSTOCKORGID.ToString() +
                 ") ");
                 //鎻掑叆瀛愯〃
                 foreach (Model.ClsSc_MaterToSourceBillSub oSub in DetailColl)

--
Gitblit v1.9.1