MES-WEB-API.git

			@@ -473,6 +473,7 @@

			long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
			string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
			string HMainSourceBillSubType = mainList[0].HMainSourceBillSubType;
			long HPRDORGID = mainList[0].HPRDORGID;//缁勭粐
			DateTime HDate = mainList[0].HDate;//鏃ユ湡
			string HRemark = mainList[0].HRemark;//澶囨敞
			@@ -515,12 +516,12 @@
			{
			//涓昏〃
			oCN.RunProc(@"Insert Into Sc_ICMOBillMain
			(HBillType,HBillStatus,HInterID,HBillNo,HDate,HPRDORGID
			(HBillType,HMainSourceBillSubType,HBillStatus,HInterID,HBillNo,HDate,HPRDORGID
			,HYear,HPeriod,HRemark,HMaker,HMakeDate
			,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
			,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate
			,HIsStockQty,HRemark3)
			values('3710',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID +
			values('3710','" + (HMainSourceBillSubType==null?"":HMainSourceBillSubType) + "',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID +
			"," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
			",'" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HEmpID + "," + HCusID +
			"," + HCenterID + ",0,0,0,0," + HBomID + ",'',''" +
			@@ -545,6 +546,7 @@

			//淇敼
			oCN.RunProc("update Sc_ICMOBillMain set " +
			"HMainSourceBillSubType='" + (HMainSourceBillSubType == null ? "" : HMainSourceBillSubType) + "'," +
			"HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
			", HSeOrderBillNo='" + HSeOrderBillNo + "', HSeOrderInterID=" + HSeOrderInterID + ", HSeOrderEntryID=" + HSeOrderEntryID + ", HEmpID=" + HEmpID + ", HCusID=" + HCusID +
			", HCenterID=" + HCenterID + ",HBomID=" + HBomID + ",HIsStockQty='"+ HIsStockQty + "',HRemark3='" + HRemark3 + "' where HInterID=" + HInterID);
			@@ -670,14 +672,14 @@
			,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
			,HBomID,HEntryCusID,HSTOCKINORGID
			,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
			,HAuxQty,HAuxUnit,HWidth,HWeight,HColorRemark,HCusMaterName,HCusModel,HOrderPickRemark,HCusMaterNumber)
			,HAuxQty,HAuxUnit,HWidth,HWeight,HColorRemark,HCusMaterName,HCusModel,HOrderPickRemark,HCusMaterNumber,HWidth_New,HWeight_New,HMaterModel,HRemark_New)
			values({HInterID},{HEntryID},{(oSub.HQty == null ? 0 : oSub.HQty)}
			,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
			,'{(oSub.HBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HBeginDate.ToString())}','{(oSub.HEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HEndDate.ToString())}'
			,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},{oSub.HSTATUS}
			,{oSub.HBomID} ,{oSub.HCusID} ,{oSub.HSTOCKINORGID}
			,{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',0,0
			,{oSub.HAuxQty},{oSub.HAuxUnit},{oSub.HWidth},{oSub.HWeight},'{oSub.HColorRemark}','{oSub.HCusMaterName}','{oSub.HCusModel}','{oSub.HOrderPickRemark}','{oSub.HCusMaterNumber}')");
			,{oSub.HAuxQty},{oSub.HAuxUnit},{oSub.HWidth},{oSub.HWeight},'{oSub.HColorRemark}','{oSub.HCusMaterName}','{oSub.HCusModel}','{oSub.HOrderPickRemark}','{oSub.HCusMaterNumber}',{oSub.HWidth_New},{oSub.HWeight_New},'{oSub.HModel}','{oSub.HRemark_New}')");


			objJsonResult.code = "1";