From b129762a4bb5ec2cde5edf16bc9cbda57c73587d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 24 五月 2023 09:33:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/DLL/ClsSc_ProcessReport.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/WebAPI/DLL/ClsSc_ProcessReport.cs b/WebAPI/DLL/ClsSc_ProcessReport.cs
index f70be5b..f1c9bb5 100644
--- a/WebAPI/DLL/ClsSc_ProcessReport.cs
+++ b/WebAPI/DLL/ClsSc_ProcessReport.cs
@@ -145,6 +145,8 @@
//鎻掑叆瀛愯〃
foreach (Models.ClsSc_ProcessReportSub oSub in DetailColl)
{
+
+
oCn.RunProc("Insert into Sc_ProcessReportSub " +
" (HInterID,HEntryID,HProcID,HProcNumber,HEmpID" +
",HMaterID,HMaterNumber,HOutPrice,HOutMoney" +
@@ -158,7 +160,7 @@
"HSecUnitQty1,HSecUnitRate1,HSecUnitQty2,HSecUnitRate2,HUsingQty,"+
"HSelfBadCount,HPreBadCount,HPayMentQty,HOtherDeduct,HRelPay,"+
"HOtherItem1,HOtherItem2,HOtherItem3,HOtherItem4,HOtherItem5,"+
- "HPackType,HCheckEmpID,HWeight,HBatchNo" +
+ "HPackType,HCheckEmpID,HWeight,HBatchNo,HRelationInterID" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNumber + "'," + oSub.HEmpID.ToString() +
"," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber + "'," + oSub.HOutPrice.ToString() + "," + oSub.HOutMoney.ToString() +
@@ -173,17 +175,19 @@
"," + oSub.HSecUnitQty1.ToString() + "," + oSub.HSecUnitRate1.ToString() + "," + oSub.HSecUnitQty2.ToString() + "," + oSub.HSecUnitRate2.ToString() + "," + oSub.HUsingQty.ToString() +
"," + oSub.HSelfBadCount.ToString() + "," + oSub.HPreBadCount.ToString() + "," + oSub.HPayMentQty.ToString() + "," + oSub.HOtherDeduct.ToString() + "," + oSub.HRelPay.ToString() +
",'" + oSub.HOtherItem1.ToString() + "','" + oSub.HOtherItem2.ToString() + "','" + oSub.HOtherItem3.ToString() + "','" + oSub.HOtherItem4.ToString() + "','" + oSub.HOtherItem5.ToString() +
- "','" + oSub.HPackType.ToString() + "'," + oSub.HCheckEmpID.ToString() + "," + oSub.HWeight.ToString() + ",'" + oSub.HBatchNo + "'" +
+ "','" + oSub.HPackType.ToString() + "'," + oSub.HCheckEmpID.ToString() + "," + oSub.HWeight.ToString() + ",'" + oSub.HBatchNo + "','0'" +
") ");
}
//鏇存柊鍏宠仈鏁伴噺
- AddNewRelation(ref sReturn, omodel.HInterID);
+ //AddNewRelation(ref sReturn, omodel.HInterID);
+ //鏇存柊鍏宠仈鏁伴噺
+ oCn.RunProc("exec h_p_Sc_UpDateICMOBillStepStatusRelation_Add " + omodel.HInterID);
//鍥炲～ 鐢熶骇鐘舵�佽〃 鏃ヨ鍒� 涓� 宸插畬宸� 鐘舵��
- oCn.RunProc("exec h_p_Sc_UpDateICMOBillQualityStatus " + omodel.HICMOStatusInterID.ToString() + ",3");
+ //oCn.RunProc("exec h_p_Sc_UpDateICMOBillQualityStatus " + omodel.HICMOStatusInterID.ToString() + ",3");
//榛樿鍙樹负 鐢宠妫�楠岀姸鎬�
oCn.RunProc("exec h_p_Sc_UpDateProcessReportStatus " + omodel.HInterID.ToString() + ",15");
//
- sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ sReturn = omodel.HInterID.ToString();
oCn.Commit();
return true;
}
--
Gitblit v1.9.1