~yxj/MES-WEB-API.git

			@@ -87,6 +87,8 @@
			",HExplanation='" + omodel.HExplanation + "'" +
			",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
			",HSupID=" + omodel.HSupID.ToString() +
			",HEmpID=" + omodel.HEmpID.ToString() +
			",HCusID=" + omodel.HCusID.ToString() +
			",HMainMaterID=" + omodel.HMainMaterID.ToString() +
			",HKeyMaterID=" + omodel.HKeyMaterID.ToString() +
			",HWorkShopID=" + omodel.HWorkShopID.ToString() +
			@@ -94,10 +96,28 @@
			",HProjectNum='" + omodel.HProjectNum.ToString() + "'" +
			",HMateOutBatchNo='" + omodel.HMateOutBatchNo + "'" +
			",HBLFlag='" + (omodel.HBLFlag ? 1 : 0) + "'" +
			",HMachineLine='" + omodel.HMachineLine + "'" +
			",HXTNumber='" + omodel.HXTNumber + "'" +
			",HXTModel='" + omodel.HXTModel + "'" +
			",HRemark2='" + omodel.HRemark2 + "'" +
			",HRemark3='" + omodel.HRemark3 + "'" +
			",HCusNumber='" + omodel.HCusNumber + "'" +

			",HMaterModel='" + omodel.HMaterModel + "'" +
			",HWidth='" + omodel.HWidth + "'" +
			",HWeight='" + omodel.HWeight + "'" +
			",HAuxQty='" + omodel.HAuxQty + "'" +
			",HAuxUnit='" + omodel.HAuxUnit + "'" +
			",HSplitNo='" + omodel.HSplitNo + "'" +
			",HHeight='" + omodel.HHeight + "'" +
			",HInches='" + omodel.HInches + "'" +
			",HAl1Long='" + omodel.HAl1Long + "'" +
			",HDensity='" + omodel.HDensity + "'" +
			",HTela='" + omodel.HTela + "'" +
			",HSplitSumQty='" + omodel.HSplitSumQty + "'" +
			",HSplitColorQty='" + omodel.HSplitColorQty + "'" +
			",HUnderTela='" + omodel.HUnderTela + "'" +
			",HSizing='" + omodel.HSizing + "'" +
			",HSellDate='" + omodel.HSellDate + "'" +
			",HProdMaterCode='" + omodel.HProdMaterCode + "'" +
			",HSeOrderBillNo='" + omodel.HSeOrderBillNo + "'" +
			",HCusShortName='" + omodel.HCusShortName + "'" +
			@@ -122,6 +142,7 @@
			",HMaterTexture='" + omodel.HMaterTexture + "'" +
			",HProductNum='" + omodel.HProductNum + "'" +
			",HVerNum='" + omodel.HVerNum + "'" +
			",HColorRemark='" + omodel.HColorRemark + "'" +
			",HWorkBillSortNo='" + omodel.HWorkBillSortNo + "'" +
			//鍔犲叆鐢熶骇绫诲瀷
			",HWorkTypeNum='" + omodel.HWorkTypeNum + "'" +
			@@ -155,7 +176,7 @@
			",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID," +
			"HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
			",HSupID,HSupFlag,HOverRate,HMaxQty,HTechnologyParameter,HProcCheckNote,HPicNum" +
			",HMouldNo,HProcWorkNum,HSeOrderInterID,HSeOrderEntryID" +
			",HMouldNo,HProcWorkNum,HSeOrderInterID,HSeOrderEntryID,HRelationQty_OutBad" +
			") values("
			+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + omodel.HBillNo + "'" +
			",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
			@@ -173,7 +194,7 @@
			",'" + oSub.HKeyProc + "','" + oSub.HFstProc + "'," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HWWOrderInterID.ToString() +
			"," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HReportQty.ToString() + "," + Convert.ToString(oSub.HBackProc ? 1 : 0) +
			"," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','" + oSub.HPicNum + "'" +
			",'" + oSub.HMouldNo + "','" + oSub.HProcWorkNum + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderInterID) + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderEntryID) + "'"+
			",'" + oSub.HMouldNo + "','" + oSub.HProcWorkNum + "','" + DBUtility.ClsPub.isInt(omodel.HSeOrderInterID) + "','" + DBUtility.ClsPub.isInt(omodel.HSeOrderEntryID) + "','" + DBUtility.ClsPub.isInt(oSub.HRelationQty_OutBad) + "'" +
			") ");
			oCn.RunProc(sql1);
			}
			@@ -298,8 +319,11 @@
			",HProdMaterCode,HSeOrderBillNo,HCusShortName,HCusNeedMaterial,HPlanSendGoodsDate" +
			",HProdMaterName,HCusName,HWorkRemark,HImportNote,HMaterNumber_A" +
			",HMaterNumber_B,HMaterNumber_C,HMaterNumber_D,HProdType,HMaterShortName" +
			",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD,HICMOEntryID" + ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HPRDORGID,HBLFlag,HCusNumber,HPickLabel,HPickLabelNumber,HXTNumber,HXTModel,HWorkBillSortNo" +
			", HRoutingBillID) " +
			",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD,HICMOEntryID" +
			",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HPRDORGID,HBLFlag,HCusNumber,HPickLabel,HPickLabelNumber,HXTNumber,HXTModel,HWorkBillSortNo" +
			", HRoutingBillID,HMaterModel,HWidth,HWeight,HAuxQty,HAuxUnit,HSplitNo" +
			",HHeight,HInches,HAl1Long,HDensity,HTela,HUnderTela,HSizing,HSellDate" +
			",HRemark2,HRemark3,HEmpID,HCusID,HColorRemark,HSplitSumQty,HSplitColorQty,HMachineLine) " +
			" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()," + "" + (omodel.HPrevMainSourceInterID == 0 ? omodel.HInterID : omodel.HPrevMainSourceInterID) +
			"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HBatchNo + "'," + omodel.HMainMaterID.ToString() + "," + omodel.HKeyMaterID.ToString() + "," + omodel.HNo.ToString() + ",'" + omodel.HOrderProcNO + "'" +
			"," + omodel.HWWOrderInterID.ToString() + "," + omodel.HWWOrderEntryID.ToString() + ",'" + omodel.HWWOrderBillNo + "'," + omodel.HICMOInterID.ToString() + "," + omodel.HEquipMentID.ToString() +
			@@ -311,7 +335,9 @@
			",'" + omodel.HMaterNumber_B + "','" + omodel.HMaterNumber_C + "','" + omodel.HMaterNumber_D + "','" + omodel.HProdType + "','" + omodel.HMaterShortName + "'" +
			",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'," + omodel.HICMOEntryID +
			",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "','" + (omodel.HBLFlag ? 1 : 0) + "','" + omodel.HCusNumber + "','" + omodel.HPickLabel + "','" + omodel.HPickLabelNumber + "','" + omodel.HXTNumber + "','" + omodel.HXTModel + "','" + omodel.HWorkBillSortNo +
			"',"+ omodel.HRoutingBillID + ") ");
			"',"+ omodel.HRoutingBillID + ",'"+ omodel.HMaterModel + "',"+ omodel.HWidth + ","+ omodel.HWeight + ","+ omodel.HAuxQty + ","+ omodel.HAuxUnit +","+ omodel.HSplitNo +"" +
			",'" + omodel.HHeight + "','" + omodel.HInches + "','" + omodel.HAl1Long + "','" + omodel.HDensity + "','" + omodel.HTela + "','" + omodel.HUnderTela + "','" + omodel.HSizing + "','" + omodel.HSellDate + "'" +
			",'"+ omodel.HRemark2 + "','"+ omodel.HRemark3 + "',"+ omodel.HEmpID + "," + omodel.HCusID + ",'"+ omodel.HColorRemark + "',"+ omodel.HSplitSumQty + ","+ omodel.HSplitColorQty + ",'"+ omodel.HMachineLine + "')");
			sErr = sErr + "1;";
			//鎻掑叆瀛愯〃
			foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
			@@ -521,6 +547,25 @@
			omodel.HVerNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HVerNum"]);
			omodel.HRoutingBillID = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRoutingBillID"]);
			omodel.HPRDORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPRDORGID"]);
			omodel.HMaterModel = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterModel"]);
			omodel.HWidth = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HWidth"]);
			omodel.HWeight = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HWeight"]);
			omodel.HAuxQty = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HAuxQty"]);
			omodel.HAuxUnit = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HAuxUnit"]);
			omodel.HSplitNo = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HSplitNo"]);
			omodel.HRemark2 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark2"]);
			omodel.HRemark3 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark3"]);
			omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"].ToString());
			omodel.HHeight = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HHeight"]);
			omodel.HInches = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInches"]);
			omodel.HAl1Long = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HAl1Long"]);
			omodel.HDensity = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDensity"]);
			omodel.HTela = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HTela"]);
			omodel.HUnderTela = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUnderTela"]);
			omodel.HSizing = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSizing"]);
			omodel.HSellDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSellDate"]);
			omodel.HCusID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCusID"].ToString());
			omodel.HColorRemark = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HColorRemark"].ToString());
			//
			//寰幆
			DataSet DsSub;