MESWMS-WEBS.git

			@@ -26008,7 +26008,7 @@
			//生成出入库单据
			//插入子表
			//插入主表
			oCn.RunProc("EXEC h_p_Kf_MouldProdInBill_Insert_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'");
			oCn.RunProc("EXEC h_p_Kf_MouldProdInBill_Insert_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','"+oMain.HBillType+"'");

			//插入主表
			oCn.RunProc("Insert Into Sc_MouldStockBillMain " +
			@@ -27608,21 +27608,7 @@
			}
			}

			//缓存列表界面，返回缓存列表信息(工序汇报转移单)
			[WebMethod]
			public DataSet GetKf_PonderationBillMain_TempList_ProcReportMove(string sHBillType, string sHMaker, Int64 sHOWNERID, Int64 sHSubBillType)
			{
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			DataSet Ds = oCn.RunProcReturn("exec h_p_KF_GetPonderationBillMain_TempList_ProcReportMove '" + sHBillType + "','" + sHMaker + "'," + sHOWNERID.ToString() + "," + sHSubBillType.ToString(), "h_p_KF_GetPonderationBillMain_TempList_ProcReportMove");
			if (Ds == null \|\| Ds.Tables[0].Rows.Count == 0)
			{
			return null;
			}
			else
			{
			return Ds;
			}
			}


			//已上传列表界面，撤销功能，删除WMS表和本地出入库单记录，并更新TEMP表中的上传字段 HRelationInterID=0
			[WebMethod]
			@@ -33447,8 +33433,8 @@


			//器具一键扫码模式，根据条码前缀走不同方法（仓库、仓位、部门）（源单、物料条码）
			[WebMethod]
			public Model.ClsKf_ICStockBill_Mould get_CheckTypeByBarCode_Mould(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool HRedBlueFlag, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HOWNERID, string HExpressNumber, ref string sErrMsg)
			[WebMethod] // sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, SCWhID, HStockInOrgID, HStockOutOrgID
			public Model.ClsKf_ICStockBill_Mould get_CheckTypeByBarCode_Mould(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool HRedBlueFlag, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HOWNERID, string HExpressNumber,Int64 SCWhID, Int64 HStockInOrgID,Int64 HStockOutOrgID, ref string sErrMsg)
			{
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			Model.ClsKf_ICStockBill_Mould oBar = new Model.ClsKf_ICStockBill_Mould();
			@@ -33473,7 +33459,7 @@
			if (oSystemParameter.omodel.WMS_OneKeyMode.ToUpper() == "N")
			{
			//将物料条码信息写入出入库条码临时表
			if (set_SavePonderationBillMain_Temp_BarCode_Mould(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, HExpressNumber, ref sHSourceBillNo, ref sHSourceBillType, ref sHSupID, ref sHSupName, ref sHDeptID, ref sHDeptName, ref sErrMsg))
			if (set_SavePonderationBillMain_Temp_BarCode_Mould(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, HExpressNumber,SCWhID, HStockInOrgID, HStockOutOrgID, ref sHSourceBillNo, ref sHSourceBillType, ref sHSupID, ref sHSupName, ref sHDeptID, ref sHDeptName, ref sErrMsg))
			{
			oBar.HSourceBillType = sHSourceBillType;
			oBar.HSourceBillNo = sHSourceBillNo;
			@@ -33509,7 +33495,7 @@
			if (Dss == null \|\| Dss.Tables[0].Rows.Count == 0)
			{
			//将物料条码信息写入出入库条码临时表
			if (set_SavePonderationBillMain_Temp_BarCode_Mould(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, HExpressNumber, ref sHSourceBillNo, ref sHSourceBillType, ref sHSupID, ref sHSupName, ref sHDeptID, ref sHDeptName, ref sErrMsg))
			if (set_SavePonderationBillMain_Temp_BarCode_Mould(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, HExpressNumber, SCWhID, HStockInOrgID, HStockOutOrgID, ref sHSourceBillNo, ref sHSourceBillType, ref sHSupID, ref sHSupName, ref sHDeptID, ref sHDeptName, ref sErrMsg))
			{
			oBar.HSourceBillType = sHSourceBillType;
			oBar.HSourceBillNo = sHSourceBillNo;
			@@ -33732,7 +33718,7 @@

			//扫描物料条码保存到出入库条码临时表(物料)
			[WebMethod]
			public bool set_SavePonderationBillMain_Temp_BarCode_Mould(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool HRedBlueFlag, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HOWNERID, string HExpressNumber, ref string sHSourceBillNo, ref string sHSourceBillType, ref long sHSupID, ref string sHSupName, ref long sHDeptID, ref string sHDeptName, ref string sErrMsg)
			public bool set_SavePonderationBillMain_Temp_BarCode_Mould(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool HRedBlueFlag, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HOWNERID, string HExpressNumber, Int64 SCWhID, Int64 HStockInOrgID, Int64 HStockOutOrgID, ref string sHSourceBillNo, ref string sHSourceBillType, ref long sHSupID, ref string sHSupName, ref long sHDeptID, ref string sHDeptName, ref string sErrMsg)
			{
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			DAL.ClsKF_PonderationBillMain_Temp_Ctl_Mould tem = new DAL.ClsKF_PonderationBillMain_Temp_Ctl_Mould();
			@@ -33845,13 +33831,18 @@

			model.HWhID = HWhID;
			model.HStockPlaceID = HSPID;
			model.HSCWHID = SCWhID;
			model.HStockOrgID = HStockInOrgID;



			model.HSourceInterID = dal.omodel_View.HSourceInterID;
			model.HSourceEntryID = dal.omodel_View.HSourceEntryID;
			model.HSourceBillNo = dal.omodel_View.HSourceBillNo;
			model.HSourceBillType = HSourceBillType;
			model.HRedBlueFlag = HRedBlueFlag;
			model.HPieceQty = 1;
			model.HOtherOrgID = HOWNERID;
			model.HOtherOrgID = HStockOutOrgID;
			model.HOWNERID = HOWNERID;

			////获取系统参数