MES-WEB-API.git

			@@ -159,7 +159,7 @@
			string sReturn = "";
			if (oSystemParameter.ShowBill(ref sReturn) == true)
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "乔一") //系统参数判断客户
			if (oSystemParameter.omodel.WMS_CampanyName == "乔一" \|\| oSystemParameter.omodel.WMS_CampanyName == "杭州斯莫尔") //系统参数判断客户
			{
			//判断生产资源
			if (HSourceID <= 0)
			@@ -422,6 +422,26 @@
			objJsonResult.Verify = "N";
			}
			}

			//测试语句===========================================================================================================
			string msg_str = "";
			string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " +
			"from Sc_ProcessExchangeBillMain as a " +
			"inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " +
			"where a.HInterID = " + HProcExchInterID;
			DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain");
			if (ds_str.Tables[0].Rows.Count > 0)
			{
			msg_str = "HQty_Main:" + ds_str.Tables[0].Rows[0]["HQty_Main"].ToString() + ";HQty_Sub:";
			for (int j = 0; j < ds_str.Tables[0].Rows.Count; j++)
			{
			msg_str += ds_str.Tables[0].Rows[j]["HQty_Sub"].ToString() + ",";
			}
			}

			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "修改工序进站单据：" + HBillNo + "[工序流转卡号：" + HProcExchBillNo + "]" + msg_str + "','LMES-工序出站模块','" + DBUtility.ClsPub.IPAddress + "','新增或修改单据'", ref DBUtility.ClsPub.sExeReturnInfo);
			//==============================================================================================================

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "新增单据成功！";
			@@ -578,10 +598,10 @@
			Where a.HInterID={HProcExchInterID} and b.HEntryID={HProcExchEntryID}
			) a
			inner join (
			select a.HICMOInterID,a.HICMOEntryID, b.HProcID
			select a.HICMOInterID,a.HICMOEntryID,isnull(c.HItemID,0) HProcID
			from Sc_PPBomBillMain a with(nolock)
			inner join Sc_PPBomBillSub b with(nolock) on a.HInterID=b.HInterID
			Where b.HKeyMaterID_Line<>0
			left join Gy_Process c on b.HProcName = c.HName
			)b on a.HICMOInterID=b.HICMOInterID and a.HICMOEntryID=b.HICMOEntryID and a.HProcID=b.HProcID", "Sc_ProcessExchangeBillMain");

			if (ds.Tables[0].Rows.Count > 0) {