From 16bb2f7b48cf2c3cfbb6a026c265d4e52d22eca4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期六, 29 十月 2022 17:11:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/生产管理/模具管理/ClsSc_MouldMaintainBill.cs | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
index 11dc22d..c4a8d5e 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
@@ -57,7 +57,7 @@
",HEndDate='" + omodel.HEndDate + "'" +
",HExplanation='" + omodel.HExplanation + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
-
+ ",HMouldMaintainRuleInterID="+omodel.HMouldMaintainRuleInterID.ToString()+
//",HDeptID=" + omodel.HDeptID.ToString() +
//",HDeptNumber='" + omodel.HDeptNumber +"'"+
//",HEmpID=" + omodel.HEmpID.ToString() +
@@ -74,25 +74,26 @@
DeleteBillSub2(lngBillKey);
omodel.HInterID = lngBillKey;
//鎻掑叆淇濆吇椤瑰瓙琛�
- foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item oSub in DetailCol)
+ foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item Item in DetailCol)
{
- oCn.RunProc("Insert into Sc_MouldMaintainBillSub " +
- " (HInterID,HEntryID,HMaintainItemID" +
- ",HMaintainPart,HClaim" +
- ",HManagerID" +
- ",HCloseMan,HCloseType,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaintainItemID.ToString() +
- ",'" + oSub.HMaintainPart.ToString() + "','" + oSub.HClaim.ToString() + "'" +
- "," + oSub.HManagerID.ToString() +
- ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- ") ");
+ oCn.RunProc("Insert into Sc_MouldMaintainBillSub_Item" +
+ " (HInterID,HEntryID,HMaintainItemID,HMaintainItem" +
+ ",HMaintainPart,HClaim" +
+ ",HManagerID" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + Item.HEntryID.ToString() + "," + Item.HMaintainItemID.ToString() + ",'" + Item.HMaintainItem.ToString() + "'" +
+ ",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" +
+ "," + Item.HManagerID.ToString() +
+ ",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" +
+ "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() +
+ ") ");
}
//鎻掑叆閰嶄欢椤瑰瓙琛�
foreach (Model.ClsSc_MouldMaintainBillSub oSub in DetailColl)
{
+
oCn.RunProc("Insert into Sc_MouldMaintainBillSub " +
" (HInterID,HEntryID,HMaterID" +
",HQty,HUnitID" +
@@ -145,19 +146,19 @@
",HYear,HPeriod,HRemark" +
",HPlanNo,HPlanInterID,HMouldID,HBeginDate"+
",HEndDate"+
- ",HInnerBillNo,HExplanation" +
+ ",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
",'" + omodel.HPlanNo + "'," + omodel.HPlanInterID.ToString() + "," + omodel.HMouldID.ToString() + ",'" + omodel.HBeginDate + "'" +
",'" + omodel.HEndDate + "'"+
- ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'" +
+ ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'," +omodel.HMouldMaintainRuleInterID.ToString()+
") ");
if (DetailCol.Count > 0)
{
//鎻掑叆淇濆吇椤瑰瓙琛�
- foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item oSub in DetailCol)
+ foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item Item in DetailCol)
{
oCn.RunProc("Insert into Sc_MouldMaintainBillSub_Item" +
" (HInterID,HEntryID,HMaintainItemID,HMaintainItem" +
@@ -166,11 +167,11 @@
",HCloseMan,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaintainItemID.ToString() + ",'" + oSub.HMaintainItem.ToString() + "'" +
- ",'" + oSub.HMaintainPart.ToString() + "','" + oSub.HClaim.ToString() + "'" +
- "," + oSub.HManagerID.ToString() +
- ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ + omodel.HInterID.ToString() + "," + Item.HEntryID.ToString() + "," + Item.HMaintainItemID.ToString() + ",'" + Item.HMaintainItem.ToString() + "'" +
+ ",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" +
+ "," + Item.HManagerID.ToString() +
+ ",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" +
+ "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() +
") ");
}
}
--
Gitblit v1.9.1