MES-WEB-API.git

			@@ -26,7 +26,10 @@
			",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" +
			",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HUSEORGID,HERPItemID" +
			",HSALEUNITID,HSALEPRICEUNITID,HBASEUNITID,HSTOREUNITID,HCHECKINCOMING,HCHECKPRODUCT,HPERUNITSTANDHOUR" +
			",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME,HWidth,HWeight,HColorRemark,HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol) " +
			",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME,HWidth,HWeight,HColorRemark,HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol" +
			",HMaterRuleType,HColorNo,HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost,HOnceRightRate" +
			",HHeight_M,HInches_M,HAl1Long_M,HDensity_M,HTela_M,HUnderTela_M,HSizing_M" +
			") " +
			" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
			", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
			",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
			@@ -34,7 +37,16 @@
			", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
			", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
			",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HSALEUNITID + "," + oModel.HSALEPRICEUNITID + "," + oModel.HBASEUNITID + "," + oModel.HSTOREUNITID + "," + oModel.HCHECKINCOMING + "," + oModel.HCHECKPRODUCT + "," + oModel.HPERUNITSTANDHOUR + "," + oModel.HSTDLABORPREPARETIME + "," + oModel.HSTDMACHINEPREPARETIME + ","+ oModel.HWidth + "," + oModel.HWeight + ",'"+ oModel.HColorRemark + "'," + oModel.HQCSchemeID_Fst + ","
			+ oModel.HQCSchemeID_Proc + "," + oModel.HQCSchemeID_Patrol + ")", ref DBUtility.ClsPub.sExeReturnInfo);
			+ oModel.HQCSchemeID_Proc + "," + oModel.HQCSchemeID_Patrol + "" +
			",'"+ oModel.HMaterRuleType + "','"+ oModel.HColorNo + "','" + oModel.HPieceMaxQty.ToString() + "','" + oModel.HCommonUseFlag.ToString() + "','" + oModel.HAvgStockPrice.ToString() + "','" + oModel.HFootPrice.ToString() + "','" + oModel.HTaxCost.ToString() + "','" + oModel.HNoTaxCost.ToString() + "'," + oModel.HOnceRightRate + "" +
			",'" + oModel.HHeight_M + "'" +
			",'" + oModel.HInches_M + "'" +
			",'" + oModel.HAl1Long_M + "'" +
			",'" + oModel.HDensity_M + "'" +
			",'" + oModel.HTela_M + "'" +
			",'" + oModel.HUnderTela_M + "'" +
			",'" + oModel.HSizing_M + "'" +
			")", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCn.Commit();
			@@ -56,6 +68,31 @@
			oCn.RunProc(sql);
			sql = "set identity_insert gy_material on";
			oCn.RunProc(sql);
			LogService.Write("物料:" + "Insert into Gy_Material (" +
			"HItemId,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark" +
			",HModel,HUnitID,HMaterClsID,HMaterTypeID,HUnitGroupID" +
			",HWhID,HRoutingID,HBomID,HSecUnitID,HSecUnitRate" +
			",HHighStock,HLowStock,HSafeStock,HOrderPrice,HSalePrice" +
			",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" +
			",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID" +
			",HMinPickQty,HCREATEORGID,HUSEORGID,HERPItemID,HBatchManager,HOldMaterNumber" +
			",HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost" +
			",HLength,HWidth,HHeight,HJQty,HPlanMode,HUseFlag,HMakeTime,HCHECKINCOMING,HAuxPropFlag" +
			", HISKFPERIOD, HEXPUNIT, HEXPPERIOD, HAuxUnitID, HSNUnitID, HBASEUNITID, HSALEUNITID" +
			", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID) " +
			" Values('" + oModel.HItemID + "','" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
			", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
			",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
			", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() +
			", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
			", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
			",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString()
			+ "," + oModel.HMinPickQty.ToString() + "," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + "," + oModel.HItemID + "," + oModel.HBatchManager + ",'" + oModel.HOldMaterNumber + "','" +
			oModel.HPieceMaxQty.ToString() + "','" + oModel.HCommonUseFlag.ToString() + "','" + oModel.HAvgStockPrice.ToString() + "','" + oModel.HFootPrice.ToString() + "','" + oModel.HTaxCost.ToString() + "','" + oModel.HNoTaxCost.ToString() + "'," +
			oModel.HLength.ToString() + "," + oModel.HWidth.ToString() + "," + oModel.HHeight.ToString() + "," + oModel.HJQty.ToString() + "," + oModel.HPlanMode.ToString() + ",'" + oModel.HUseFlag.ToString() + "','" + oModel.HMakeTime.ToString() + "'," + oModel.HCHECKINCOMING.ToString() + "," + oModel.HAuxPropFlag.ToString() + "," +
			oModel.HISKFPERIOD.ToString() + ",'" + oModel.HEXPUNIT.ToString() + "'," + oModel.HEXPPERIOD.ToString() + "," + oModel.HAuxUnitID.ToString() + "," + oModel.HSNUnitID.ToString() + "," + oModel.HBASEUNITID.ToString() + "," + oModel.HSALEUNITID.ToString() + "," +
			oModel.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() + ")");
			oCn.RunProc("Insert into Gy_Material (" +
			"HItemId,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark" +
			@@ -63,14 +100,24 @@
			",HWhID,HRoutingID,HBomID,HSecUnitID,HSecUnitRate" +
			",HHighStock,HLowStock,HSafeStock,HOrderPrice,HSalePrice" +
			",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" +
			",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HCREATEORGID,HUSEORGID,HERPItemID,HBatchManager,HOldMaterNumber) " +
			",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID" +
			",HMinPickQty,HCREATEORGID,HUSEORGID,HERPItemID,HBatchManager,HOldMaterNumber" +
			",HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost" +
			",HLength,HWidth,HHeight,HJQty,HPlanMode,HUseFlag,HMakeTime,HCHECKINCOMING,HAuxPropFlag" +
			", HISKFPERIOD, HEXPUNIT, HEXPPERIOD, HAuxUnitID, HSNUnitID, HBASEUNITID, HSALEUNITID" +
			", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID) " +
			" Values('" + oModel.HItemID + "','" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
			", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
			",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
			", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() +
			", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
			", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
			",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HBatchManager + ",'" + oModel.HOldMaterNumber + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString()
			+ "," + oModel.HMinPickQty.ToString() + "," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + "," + oModel.HItemID + "," + oModel.HBatchManager + ",'" + oModel.HOldMaterNumber + "','" +
			oModel.HPieceMaxQty.ToString() + "','" + oModel.HCommonUseFlag.ToString() + "','" + oModel.HAvgStockPrice.ToString() + "','" + oModel.HFootPrice.ToString() + "','" + oModel.HTaxCost.ToString() + "','" + oModel.HNoTaxCost.ToString() + "',"+
			oModel.HLength.ToString() + "," +oModel.HWidth.ToString() + "," + oModel.HHeight.ToString() + "," + oModel.HJQty.ToString() + "," + oModel.HPlanMode.ToString() + ",'" + oModel.HUseFlag.ToString() + "','" + oModel.HMakeTime.ToString() + "'," + oModel.HCHECKINCOMING.ToString() + "," + oModel.HAuxPropFlag.ToString() + ","+
			oModel.HISKFPERIOD.ToString() + ",'" + oModel.HEXPUNIT.ToString() + "'," + oModel.HEXPPERIOD.ToString() + "," + oModel.HAuxUnitID.ToString() + "," + oModel.HSNUnitID.ToString() + "," + oModel.HBASEUNITID.ToString() + "," + oModel.HSALEUNITID.ToString() + ","+
			oModel.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
			sql = "set identity_insert gy_material off";
			oCn.RunProc(sql);
			//修改上级为非末级代码
			@@ -141,10 +188,27 @@
			",HWeight=" + oModel.HWeight.ToString() +
			",HWidth=" + oModel.HWidth.ToString() +
			",HColorRemark='" + oModel.HColorRemark.ToString() + "'" +
			",HColorNo='" + oModel.HColorNo.ToString() + "'" +
			",HMaterRuleType='" + oModel.HMaterRuleType.ToString() + "'" +
			",HQCSchemeID_Fst= " + oModel.HQCSchemeID_Fst +
			",HQCSchemeID_Proc= " + oModel.HQCSchemeID_Proc +
			",HQCSchemeID_Patrol= " + oModel.HQCSchemeID_Patrol +
			",HSTDMACHINEPREPARETIME=" + oModel.HSTDMACHINEPREPARETIME.ToString() + "Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			",HPieceMaxQty=" + oModel.HPieceMaxQty.ToString() +
			",HCommonUseFlag=" + oModel.HCommonUseFlag.ToString() +
			",HAvgStockPrice=" + oModel.HAvgStockPrice.ToString() +
			",HFootPrice=" + oModel.HFootPrice.ToString() +
			",HTaxCost=" + oModel.HTaxCost.ToString() +
			",HNoTaxCost=" + oModel.HNoTaxCost.ToString() +
			",HOnceRightRate=" + oModel.HOnceRightRate.ToString() +
			",HSTDMACHINEPREPARETIME=" + oModel.HSTDMACHINEPREPARETIME.ToString() + " " +
			",HHeight_M='" + oModel.HHeight_M + "'" +
			",HInches_M='" + oModel.HInches_M + "'" +
			",HAl1Long_M='" + oModel.HAl1Long_M + "'" +
			",HDensity_M='" + oModel.HDensity_M + "'" +
			",HTela_M='" + oModel.HTela_M + "'" +
			",HUnderTela_M='" + oModel.HUnderTela_M + "'" +
			",HSizing_M='" + oModel.HSizing_M + "'" +
			" Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改子项目代码
			oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			//将上级为非末级