MES-WEB-API.git

			@@ -2600,7 +2600,7 @@
			{
			//sCloudModeï¼ç³»ç»åæ° æ¯å¦ä¸ºç§æäºæ¨¡å¼(Nä¸ºå¬æäºæ¨¡å¼ï¼Yä¸ºç§æäºæ¨¡å¼)ï¼
			//sERPModeï¼ç³»ç»åæ° åºåæ§å¶-WMSåºåæ§å¶ERPæ¨¡å¼ (WISEãCLOUDãMES)ï¼
			//sHTypeï¼å¼ 1 å¯¹åºç¼ååè¡¨å é¤ï¼å¼ 2 å¯¹åºå·²ä¸ä¼ æ¤éï¼
			//sHTypeï¼å¼ 1 å¯¹åºç¼ååè¡¨å é¤ï¼å¼ 2 å¯¹åºå·²ä¸ä¼ æ¤éï¼å¼ 3 å¯¹åºæ ¡éªæ¨¡åå·²ä¸ä¼ æ¤éï¼

			//å¬æäºæ¨¡å¼
			if (sCloudMode == "N")
			@@ -2738,7 +2738,7 @@
			var sJson = new
			{
			FormId = sFormId,
			FieldKeys = "FBillNo",
			FieldKeys = "FBillNo,FAPPROVERID",
			FilterString = $@"FBillNo='{HBillNo}'",
			OrderString = "",
			TopRowCount = 0,
			@@ -2770,7 +2770,7 @@
			}
			}
			//sHType = 2å¯¹åºå·²ä¸ä¼ æ¤é
			else
			else if(sHType == 2)
			{
			//å¤æè¿åçæ°ç»æ°æ®ä¸æ¯å¦åå¨"false"ï¼åå¨ä»£è¡¨éå¥çä¸å¡å¯¹è±¡è¡¨åIdä¸æ£ç¡®
			if (_saveObj[0][0].ToString().Contains("false") == true)
			@@ -2784,26 +2784,73 @@
			return false;
			}
			}
			//sHType = 3å¯¹åºæ ¡éªæ¨¡åå·²ä¸ä¼ æ¤é
			else if (sHType == 3)
			{
			//å¤æè¿åçæ°ç»æ°æ®ä¸æ¯å¦åå¨"false"ï¼åå¨ä»£è¡¨éå¥çä¸å¡å¯¹è±¡è¡¨åIdä¸æ£ç¡®
			if (_saveObj[0][0].ToString().Contains("false") == true)
			{
			sErrMsg = "æ¤æ¨¡åæä¸æ¯ææ¤éåè½ï¼";
			return false;
			}
			else if (_saveObj[0][1].ToString() != "0")
			{
			sErrMsg = "æ ¡éªæ¤éåæ®å¤±è´¥ï¼åæ®å·ï¼" + HBillNo + "ï¼éè¶äºéå·²å®¡æ ¸ï¼ä¸åè®¸æ¤éï¼";
			return false;
			}
			else
			{
			return true;
			}
			}
			else
			{
			sErrMsg = "sHTypeå¼éå¥éè¯¯ï¼";
			return false;
			}
			}
			}
			}
			//ç§æäºæ¨¡å¼
			else
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_BillQuery " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + sERPMode + "'," + sHType.ToString(), "h_p_WMS_BillQuery");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			//sHType = 3 æ«ç æ ¡éªæ¨¡å
			if (sHType == 3)
			{
			sErrMsg = "åæ®æ¥è¯¢åçéè¯¯ï¼";
			return false;
			ds = oCn.RunProcReturn("exec h_p_WMS_BillQuery_BillCheck " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + sERPMode + "'", "h_p_WMS_BillQuery_BillCheck");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			sErrMsg = "åæ®æ¥è¯¢åçéè¯¯ï¼";
			return false;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			sErrMsg = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			return false;
			}
			else
			{
			return true;
			}
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			sErrMsg = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			return false;
			}
			//sHType = 1 æ sHType = 2 æ«ç æ°å¢æ¨¡å
			else
			{
			return true;
			ds = oCn.RunProcReturn("exec h_p_WMS_BillQuery " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + sERPMode + "'," + sHType.ToString(), "h_p_WMS_BillQuery");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			sErrMsg = "åæ®æ¥è¯¢åçéè¯¯ï¼";
			return false;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			sErrMsg = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			return false;
			}
			else
			{
			return true;
			}
			}
			}
			}
			@@ -4354,6 +4401,64 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å§å¤è¡¥ææ ¡éªå¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#endregion

			#region åæå å·¥åºåº ä¸ä¼ çå

			#region åæå å·¥åºåº æ ¡éªæ¨¡å¼

			/// <summary>
			/// åæå å·¥åºåºæ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveInceptEntOutBill_BillCheck_Json")]
			[HttpPost]
			public object set_SaveInceptEntOutBill_BillCheck_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();

			try
			{
			List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getICStockBillMainByJson(msg1);
			WebAPI.WebS.ClsKf_ICStockBillMain websLsmain = new WebS.ClsKf_ICStockBillMain();
			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1213";
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveInceptEntOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæå å·¥åºåºæ ¡éªå¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -8084,6 +8189,20 @@
			sAutoBarCode = "Y";
			}
			}
			//åæå å·¥å¥åºå
			else if (HBillType == "1212")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_InceptEntInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_InceptEntInBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//é¢æåºåºå
			else if (HBillType == "1204")
			{
			@@ -8164,6 +8283,20 @@
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//åæå å·¥åºåºå
			else if (HBillType == "1213")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_InceptEntOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_InceptEntOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			@@ -8699,6 +8832,14 @@
			{
			sFIFOCtl = "Y";
			}
			//åæå å·¥åºåºå-åè¿ååºæ§å¶
			if (HBillType == "1213"
			&& oSystemParameter.omodel.Kf_InceptEntOutBillCheck_AutoBarCode.ToUpper() == "N" //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			&& oSystemParameter.omodel.Kf_InceptEntOutBillCheck_SourceBarCodeCtl.ToUpper() == "N" //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			&& (oSystemParameter.omodel.Kf_InceptEntOutBillCheck_FIFOCtl == "1" \|\| oSystemParameter.omodel.Kf_InceptEntOutBillCheck_FIFOCtl == "2" \|\| oSystemParameter.omodel.Kf_InceptEntOutBillCheck_FIFOCtl == "3"))
			{
			sFIFOCtl = "Y";
			}
			//ç´æ¥è°æ¨å-åè¿ååºæ§å¶
			if (HBillType == "1207"
			&& oSystemParameter.omodel.Kf_MoveStockBillCheck_AutoBarCode.ToUpper() == "N" //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			@@ -8841,6 +8982,15 @@
			sSourceBarCodeCtl = "Y";
			}
			}
			//åæå å·¥å¥åºå
			else if (HBillType == "1212")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_InceptEntInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//é¢æåºåºå
			else if (HBillType == "1204")
			{
			@@ -8906,6 +9056,17 @@
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_FIFOCtl;
			}
			//åæå å·¥åºåºå
			else if (HBillType == "1213")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_InceptEntOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_InceptEntOutBillCheck_FIFOCtl;
			}
			//ç´æ¥è°æ¨å
			else if (HBillType == "1207")
			@@ -9214,6 +9375,15 @@
			sSourceBarCodeCtl = "Y";
			}
			}
			//åæå å·¥å¥åºå
			else if (HBillType == "1212")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_InceptEntInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//é¢æåºåºå
			else if (HBillType == "1204")
			{
			@@ -9264,6 +9434,15 @@
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//åæå å·¥åºåºå
			else if (HBillType == "1213")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_InceptEntOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -9323,6 +9502,16 @@
			}
			}
			#endregion

			//æ¤éåå¤æéè¶äºä¸åæ®æ¯å¦åå¨
			if (!GetBillQuery_WMS(HInterID, HBillNo, HBillType, HMaker, oSystemParameter.omodel.WMS_CloudMode, sERPMode, 3, ref sErrMsg))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}

			try
			{
			@@ -13075,6 +13264,60 @@

			#endregion

			#region WMSæ¯æ¥è¿è¡ç¶æåæï¼æ¯æ¥å¶åæ°éï¼
			[Route("WEBSController/GetKf_WMSDailyRunStateReport_Json")]
			[HttpGet]
			public object GetKf_WMSDailyRunStateReport_Json(string sWhere, string user)
			{
			try
			{

			Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);

			string HBeginDate = dic["HBeginDate"].ToString();
			string HEndDate = dic["HEndDate"].ToString();

			List<object> columnNameList = new List<object>();

			ds = oCn.RunProcReturn("exec h_p_Kf_WMSDailyRunStateReport '" + HBeginDate + "','" + HEndDate + "'", "h_p_Kf_WMSDailyRunStateReport");

			if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			{
			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds;
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æ°æ®";
			objJsonResult.data = null;
			return objJsonResult;
			}

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#endregion

			@@ -14883,8 +15126,8 @@
			{
			string sErrMsg = "";
			oSystemParameter.ShowBill(ref sErrMsg);
			// åèå®¢æ·
			if (oSystemParameter.omodel.WMS_CampanyName == "åè")
			// åèå®¢æ· å·¥åºè¿ç«æ¥æ¶å å·¥åºå§å¤æ¥æ¶å çäº§è®¢å å·¥åºæµè½¬å¡
			if (oSystemParameter.omodel.WMS_CampanyName == "åè" && HSourceBillType != 3790 && HSourceBillType != 3793 && HSourceBillType != 3710 && HSourceBillType != 3772)
			{
			if (!string.IsNullOrWhiteSpace(HBarCode))
			{
			@@ -14938,6 +15181,14 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Columns.Contains("HBack") && DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (oSystemParameter.omodel.WMS_CampanyName == "åè")
			{