From 5fccb067ad7dc2dbcdacf8db642aa471488cd8f0 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 20 二月 2025 15:24:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/计划管理/ClsGy_ICBomBill.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_ICBomBill.cs" "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_ICBomBill.cs"
index 79c75ae..c027bbd 100644
--- "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_ICBomBill.cs"
+++ "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_ICBomBill.cs"
@@ -39,9 +39,9 @@
//鏇存柊涓昏〃
oCn.RunProc("UpDate Gy_ICBomBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" +
- ",HDate='" + omodel.HDate + "'" +
- ",HYear='" + omodel.HYear.ToString() + "'" +
- ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ //",HDate='" + omodel.HDate + "'" +
+ //",HYear='" + omodel.HYear.ToString() + "'" +
+ //",HPeriod='" + omodel.HPeriod.ToString() + "'" +
",HRemark='" + omodel.HRemark + "'" +
",HUpDater='" + omodel.HUpDater + "'" +
",HUpDateDate='" + omodel.HUpDateDate + "'" +
@@ -56,6 +56,7 @@
",HProdRate=" + omodel.HProdRate.ToString() +
",HQty=" + omodel.HQty.ToString() +
",HJump='" + omodel.HJump + "'" +
+ ",HBomType='" + omodel.HBomType + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -104,12 +105,12 @@
"(HBillType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate,HMaterTypeID,HStatus" +
",HMaterID,HParentID,HVersion,HPicNo,HPropertyID" +
- ",HUnitID,HQty,HProdRate,HJump" +
+ ",HUnitID,HQty,HProdRate,HJump,HBomType" +
") " +
" values('" + this.BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate(),'" + omodel.HMaterTypeID.ToString() + "','" + omodel.HStatus +
"','" + omodel.HMaterID.ToString() + "'," + omodel.HParentID.ToString() + ",'" + omodel.HVersion + "','" + omodel.HPicNo + "'," +omodel.HPropertyID.ToString() +
- ","+omodel.HUnitID.ToString()+","+omodel.HQty.ToString()+","+omodel.HProdRate.ToString()+",'"+omodel.HJump +"'"+
+ ","+omodel.HUnitID.ToString()+","+omodel.HQty.ToString()+","+omodel.HProdRate.ToString()+",'"+omodel.HJump +"','"+omodel.HBomType + "'"+
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsGy_ICBomBillSub oSub in DetailColl)
--
Gitblit v1.9.1