MES-WEB-API.git

			@@ -322,6 +322,28 @@
			var num = 0;
			//LogService.Write($"3.事务开始，用时" + sw.Elapsed);

			//保存前控制=========================================
			string HBillNote = "";
			ds = oCN.RunProcReturn("Exec h_p_Sc_StationOutBill_BeforeSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',1 ", " h_p_Sc_StationOutBill_BeforeSaveCtrl ");
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存前判断失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			//=========================================================


			//若MAINDI重复则重新获取
			oCN.BeginTran();
			if ("Add".Equals(eventType))
			@@ -502,6 +524,29 @@
			}
			}

			//=========================保存后控制
			DataSet ds2 = oCN.RunProcReturn("Exec h_p_Sc_StationOutBill_AfterSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "',1 ", "h_p_Sc_StationOutBill_AfterSaveCtrl");
			if (ds2 == null)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存后控制判断失败！";
			objJsonResult.data = null;
			return objJsonResult;

			}
			if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败2！" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			//============================


			//LogService.Write($"10.事务结束，用时" + sw.Elapsed);
			oCN.Commit();
			@@ -598,7 +643,7 @@
			long HMaterID = listSub[i].HMaterID;//产品ID
			long HProcID = listSub[i].HProcID;//当前工序ID
			double HICMOQty = listSub[i].HICMOQty;//任务单数量
			double HPlanQty = list[0].HPlanQty;//移交PNL数
			double HPlanQty = listSub[i].HPlanQty;//移交PNL数
			DateTime HStationOutTime = list[0].HStationOutTime;//汇报时间
			long HSourceID = listSub[i].HSourceID;//生产资源ID
			long HPayProcID = list[0].HPayProcID;//核算工序ID
			@@ -621,10 +666,11 @@
			string HProcNo = listSub[i].HProcNo;//流水号
			string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
			string HSourceNameList = list[0].HSourceNameList;//设备清单
			long HMainSourceInterID = list[0].HInterID;//递入type得到的单据ID
			string HMainSourceBillNo = list[0].HBillNo;//递入type得到的单据号
			long HMainSourceInterID = listSub[0].HMainSourceInterID;//递入type得到的单据ID
			long HMainSourceEntryID = listSub[0].HMainSourceEntryID;//递入type得到的单据子ID
			string HMainSourceBillNo = listSub[0].HMainSourceBillNo;//递入type得到的单据号
			string HMainSourceBillType = "3790";
			bool HLastSubProc = list[0].HLastSubProc;//转下工序
			bool HLastSubProc = listSub[0].HLastSubProc;//转下工序
			long HEmpID2 = list[0].HEmpID2;//操作员2ID
			long HEmpID3 = list[0].HEmpID3;//操作员3ID
			long HEmpID4 = list[0].HEmpID4;//操作员4ID
			@@ -659,7 +705,7 @@
			",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSourceID2,HSourceID3,HSourceID4,HSourceID5" +
			",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
			",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
			",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" +
			",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID,HMainSourceEntryID" +
			") " +
			" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
			@@ -668,7 +714,7 @@
			"," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" + "," + HSourceID2 + "," + HSourceID3 + "," + HSourceID4 + "," + HSourceID5 +
			"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +
			"," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
			"," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
			"," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID + "," + HMainSourceEntryID +
			") ");
			}
			else