From b99276556da4de24bddaeb8452d466008da63bb5 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 12 八月 2021 11:00:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs b/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
index 1194bb9..ab96bce 100644
--- a/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
+++ b/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
@@ -28,6 +28,7 @@
         }
        
         #endregion   自定义方法
+
         //修改单据
         public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
         {
@@ -52,6 +53,10 @@
                 ",HRelationEntryID=" + omodel.HRelationEntryID.ToString() +
                 ",HRelationBillNo='" + omodel.HRelationBillNo + "'" +
                 ",HReportEntryID=" + omodel.HReportEntryID.ToString() +
+                ",HGroupID=" + omodel.HGroupID.ToString() +
+                ",HWorkManID=" + omodel.HWorkManID.ToString() +
+                ",HBadQty=" + omodel.HBadQty.ToString() +
+                ",HWasterQty=" + omodel.HWasterQty.ToString() +
                 " where HInterID=" + lngBillKey.ToString());
                 //删除关联
                 DeleteRelation(ref sReturn, lngBillKey);
@@ -78,7 +83,7 @@
                 oCn.BeginTran();
                 //主表
 
-                oCn.RunProc("Insert Into Sc_ICMOBillWorkQtyStatus_Tmp   " +
+                oCn.RunProc("Insert Into Sc_ICMOBillWorkQtyStatus_Tmp   " +   
                "(HInterID,HBillType,HSourceID,HReportType,HPieceQty" +
                ",HMaterID,HGroupID,HWorkManID,HWorkReportDate,HDate" +
                ",HBillSubType,HBillNo,HICMOInterID,HICMOEntryID,HICMOBillNo" +
@@ -95,8 +100,11 @@
                 ") ");
 
                 //根据源单主内码 设置 生产状态表 完工状态(设置本单对应得源单 为完工状态)
-                oCn.RunProcReturn("exec h_p_JIT_MESICMOReport_Status @HInterId=" + omodel.HInterID + ",@flag='完工'", "h_p_JIT_MESBeginWorkBill_BeginWork");
-                sReturn = "新增单据成功!";
+                oCn.RunProcReturn("exec h_p_JIT_MESICMOReport_Status " + omodel.HSourceID.ToString() + "," + omodel.HSourceInterID.ToString() + "," + omodel.HSourceEntryID.ToString() + ",'" + omodel.HSourceBillNo.ToString() + "','" + omodel.HPlanQty + "'", "h_p_JIT_MESICMOReport_Status");
+                //更新生产状态临时状态表数量
+                oCn.RunProcReturn("exec h_p_Sc_UpDateRelation_ICMOToICMOReport_Qty " + omodel.HICMOInterID.ToString() + "," + omodel.HICMOEntryID.ToString() + "", "h_p_Sc_UpDateRelation_ICMOToICMOReport_Qty");
+                sReturn = "新增单据成功!"; 
+             
                 oCn.Commit();
                 return true;
             }

--
Gitblit v1.9.1