MES-WEB-API.git

			@@ -82,6 +82,7 @@
			",HPRDORGID='" + omodel.HPRDORGID.ToString() + "'" +
			",HPeriod='" + omodel.HPeriod.ToString() + "'" +
			",HRemark='" + omodel.HRemark + "'" +
			",HMouldNum='" + omodel.HMouldNum + "'" +
			",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
			",HUpDateDate=getdate()" +
			",HMainSourceBillSubType='" + omodel.HMainSourceBillSubType + "'" +
			@@ -124,6 +125,10 @@
			",HWeight='" + omodel.HWeight + "'" +
			",HAuxQty='" + omodel.HAuxQty + "'" +
			",HAuxUnit='" + omodel.HAuxUnit + "'" +

			",HAuxQty2='" + omodel.HAuxQty2 + "'" +
			",HAuxUnit2='" + omodel.HAuxUnit2 + "'" +

			",HSplitNo='" + omodel.HSplitNo + "'" +
			",HHeight='" + omodel.HHeight + "'" +
			",HInches='" + omodel.HInches + "'" +
			@@ -166,7 +171,6 @@
			",HWidth_New=" + omodel.HWidth_New +
			",HWeight_New=" + omodel.HWeight_New +
			",HRemark_New='" + omodel.HRemark_New + "'" +
			",HMaterModel2='" + omodel.HMaterModel2 + "'" +
			" where HInterID=" + lngBillKey.ToString());
			//æ´æ°ä¸»è¡¨
			oCn.RunProc(sql);
			@@ -338,7 +342,11 @@
			try
			{
			//å¾å°mainid
			omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
			if (omodel.HInterID == 0 \|\| omodel.HInterID.ToString() == null \|\| omodel.HInterID.ToString() == "undefined")
			{
			omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
			}

			//è¥MAINDIéå¤åéæ°è·å

			//ä¿ååæ§å¶=========================================
			@@ -371,10 +379,11 @@
			",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,HMaterModel,HWidth,HWeight,HAuxQty,HAuxUnit,HSplitNo" +
			", HRoutingBillID,HMaterModel,HWidth,HWeight,HAuxQty,HAuxUnit,HAuxQty2,HAuxUnit2,HSplitNo" +
			",HHeight,HInches,HAl1Long,HDensity,HTela,HUnderTela,HSizing,HSellDate" +
			",HRemark2,HRemark3,HEmpID,HCusID,HColorRemark,HSplitSumQty,HSplitColorQty,HMachineLine" +
			",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HOrderLevID,HWidth_New,HRemark_New,HWeight_New,HMaterModel2) " +
			",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HOrderLevID,HWidth_New,HRemark_New,HWeight_New,HPlanOrderProcNo" +
			",HMouldNum) " +
			" values('" + this.BillType + "','" + omodel.HBillSubType + "','" + (omodel.HMainSourceBillSubType==null?"": omodel.HMainSourceBillSubType) + "'," + 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() +
			@@ -386,10 +395,11 @@
			",'" + 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.HMaterModel + "',"+ omodel.HWidth + ","+ omodel.HWeight + ","+ omodel.HAuxQty + ","+ omodel.HAuxUnit +","+ omodel.HSplitNo +"" +
			"','"+ omodel.HRoutingBillID + "','"+ omodel.HMaterModel + "',"+ omodel.HWidth + ","+ omodel.HWeight + ","+ omodel.HAuxQty + ","+ omodel.HAuxUnit + "," + omodel.HAuxQty2 + "," + omodel.HAuxUnit2 + ","+ 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 + "'" +
			","+ omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HOrderLevID + "'," + omodel.HWidth_New + ",'" + omodel.HRemark_New + "'," + omodel.HWeight_New + ",'" + omodel.HMaterModel2 + "'" +
			","+ omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HOrderLevID + "'," + omodel.HWidth_New + ",'" + omodel.HRemark_New + "'," + omodel.HWeight_New + ",'" + omodel.HPlanOrderProcNo + "'" +
			",'"+ omodel.HMouldNum + "'" +
			")");
			sErr = sErr + "1;";
			//æå¥åè¡¨
			@@ -490,12 +500,34 @@
			{
			if (oSystemParameter.omodel.Sc_ProcessExchangeBill_AutoBarCode == "Y") //ç³»ç»åæ° å·¥åºæµè½¬å¡ä¿åæ¶èªå¨åæ¥æ¡ç ä¿¡æ¯è³æ¡ç æ¡£æ¡
			{
			oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
			Int64 HBarCodeInterID = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);

			if (oSystemParameter.omodel.WMS_CampanyName == "æ·»åº·ç§æ")
			{
			oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
			",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty" +
			",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark" +
			",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate" +
			",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HGiveAwayFlag" +
			",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID,HGiveAwayFlag" +
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
			") values ("
			+ "'" + omodel.HBillNo + "','å¯ä¸æ¡ç '," + omodel.HMaterID.ToString() + "," + omodel.HUnitID.ToString() + "," + omodel.HQty.ToString()
			+ ",'" + omodel.HBatchNo + "'," + omodel.HSupID.ToString() + ",0,'" + omodel.HMaker + "',getdate(),0," + omodel.HQty.ToString()
			+ ", " + omodel.HICMOInterID.ToString() + "," + omodel.HICMOEntryID + ",'" + omodel.HICMOBillNo + "','3710',''"
			+ ",1,1,0,0,0,'å·¥åºæµè½¬å¡ä¿åèªå¨åæ¥'"
			+ ",0,'',getdate(),'',getdate()"
			+ ", " + omodel.HPRDORGID + "," + omodel.HPRDORGID + ",''," + HBarCodeInterID + ",1,0"
			+ ",'','','',0,'','')");
			}
			else
			{
			oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
			",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty" +
			",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark" +
			",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate" +
			",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID,HGiveAwayFlag" +
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
			") values ("
			+ "'" + omodel.HBillNo + "','å¯ä¸æ¡ç '," + omodel.HMaterID.ToString() + "," + omodel.HUnitID.ToString() + "," + omodel.HQty.ToString()
			@@ -503,8 +535,9 @@
			+ ", " + omodel.HInterID.ToString() + ",1,'" + omodel.HBillNo + "','3772',''"
			+ ",1,1,0,0,0,'å·¥åºæµè½¬å¡ä¿åèªå¨åæ¥'"
			+ ",0,'',getdate(),'',getdate()"
			+ ", " + omodel.HPRDORGID + "," + omodel.HPRDORGID + ",'',0,0"
			+ ", " + omodel.HPRDORGID + "," + omodel.HPRDORGID + ",''," + HBarCodeInterID + ",1,0"
			+ ",'','','',0,'','')");
			}
			}
			}
			else