MES-WEB-API.git

			@@ -16,6 +16,7 @@
			using WebAPI;
			using WebAPI.Models;
			using WebAPI.Service;
			using WebAPI.Utility;

			namespace WebAPI.Controllers
			{
			@@ -509,7 +510,7 @@
			//çé¢ä¸æªéæ©ä»åº æ ä»ä½éæ©åè¡¨çé¢è¾å¥è¿æ»¤æ¡ä»¶
			if (HWhID == 0)
			{
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HUSEORGID=" + HStockOrgID.ToString() + " and (HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%')", "h_v_IF_StockPlace");
			ds = oCn.RunProcReturn("select top 50 HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HUSEORGID=" + HStockOrgID.ToString() + " and (HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%')", "h_v_IF_StockPlace");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -1208,11 +1209,11 @@
			/// <returns></returns>
			[Route("WEBSController/GetSourceBillList_Json")]
			[HttpGet]
			public object GetSourceBillList_Json(string HBillType, string HSourceBillType, Int64 HStockOrgID, string HSourceBillNo, string HMater)
			public object GetSourceBillList_Json(string HBillType, string HSourceBillType, Int64 HStockOrgID, string HSourceBillNo, string HMater, string HCustom)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_GetSourceBillList '" + HBillType + "','" + HSourceBillType + "'," + HStockOrgID.ToString() + ",'" + HSourceBillNo + "', '" + HMater + "'", "h_p_WMS_GetSourceBillList");
			ds = oCn.RunProcReturn("exec h_p_WMS_GetSourceBillList '" + HBillType + "','" + HSourceBillType + "'," + HStockOrgID.ToString() + ",'" + HSourceBillNo + "','" + HMater + "','" + HCustom + "'", "h_p_WMS_GetSourceBillList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -4294,6 +4295,239 @@
			sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOrgID, HBillNo, HMaker);
			SourceFlag = true;
			}
			else if(oSystemParameter.omodel.WMS_CampanyName == "æ·»åº·" && HSourceBillType == "1241")
			{
			DataSet ds;
			string sql = "select HBarCode,HSourceInterID,HSourceEntryID,HSourceBillNo from Gy_BarCodeBill with(nolock) where HBarCode = '" + sBarCode + "'";
			string HDataBaseName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");//è·åéè¶æ°æ®åºåç§°
			string HSourceBillNo_TB = "";
			Int64 HSourceInterID = 0;

			ds = oCn.RunProcReturn(sql, "Gy_BarCodeBill");
			//å¤ææ¡ç ä¿¡æ¯æ¯å¦å¨æ¡ç æ¡£æ¡ä¸
			if (ds == null \|\| ds.Tables[0].Rows.Count < 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¡ç æ¡£æ¡ä¸ä¸åå¨æ¤æ¡ç ç¼å·ï¼" + sBarCode;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			//è·åå¥åºç³è¯·ååå·/ä¸»ID
			HSourceBillNo_TB = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSourceBillNo"]);
			HSourceInterID = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[0]["HSourceInterID"]);
			//æ ¹æ®å¥åºç³è¯·ååå·å¤æåæ®ä¿¡æ¯æ¯å¦å·²ç»åæ¥å°éè¶
			sql = string.Format(@"select * from FROM {0}..TFKO_t_Cust100009 with(nolock) where FBILLNO = '" + HSourceBillNo_TB + "'", HDataBaseName);

			LogService.Write("å¶ä»å¥åºæ¥è¯¢å¥åºç³è¯·åæ¯å¦åå¨ï¼" + sql);

			ds = oCn.RunProcReturn(sql, "TFKO_t_Cust100009");
			//å¥åºç³è¯·åæ²¡æåæ¥å°éè¶åè¿è¡åæ¥
			if (ds == null \|\| ds.Tables[0].Rows.Count < 1)
			{
			sql = "exec h_p_Kf_StockInRequestBillToErp '" + HSourceInterID + "','" + HSourceBillNo_TB + "'";
			ds = oCn.RunProcReturn(sql, "h_p_Kf_StockInRequestBillToErp");

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "webapiå¥åºç³è¯·ååæ¥ï¼è·åä¿¡æ¯å¤±è´¥";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			JObject model = new JObject();
			//model.Add("FBillType", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["FBillType"]) }); //åæ®ç±»å
			model.Add("FDate", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æ¥æ"])); //åæ®æ¥æ
			model.Add("FStockOrgId", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["åºåç»ç»ä»£ç "]) }); //åºåç»ç»ä»£ç
			model.Add("FBillNo", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["åæ®å·"])); //åæ®å·
			model.Add("FStockDirect", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["åºåæ¹å"])); //åºåæ¹å
			model.Add("FDEPTID", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["é¨é¨ä»£ç "]) }); //çäº§è½¦é´
			model.Add("F_paez_Text", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["å¥åºç å"])); //å¥åºç å
			model.Add("F_paez_Integer2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["çåæ°"])); //çåæ°
			model.Add("F_paez_Integer1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["çç®¡åªæ°"])); //çç®¡åªæ°
			model.Add("F_paez_Integer3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["å®é¿"])); //å®é¿
			//model.Add("F_paez_BaseProperty4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["çé"])); //çé
			model.Add("F_paez_Base", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["å·¥å·"])); //å·¥å·
			model.Add("F_paez_Combo", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["çæ¬¡ä»£ç "])); //çæ¬¡
			//model.Add("F_paez_BaseProperty1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æ¹å·"])); //æ¹å·
			model.Add("F_paez_Integer", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ç®±æ°"])); //ç®±æ°
			model.Add("F_paez_Decimal2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æ»é"])); //æ»é
			//model.Add("F_paez_BaseProperty2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æåç¼ç "])); //æåç¼ç
			//model.Add("F_paez_BaseProperty5", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["åå"])); //åå
			model.Add("F_paez_Base1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["çº¿å·"])); //çº¿å·

			//model.Add("F_paez_BaseProperty", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æºå°"])); //æºå°
			model.Add("F_paez_Decimal", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ç®±é"])); //ç®±é
			//model.Add("F_WJUK_Text", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æ¥æº"])); //æ¥æº
			model.Add("FDEPTID1", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["é¨é¨ä»£ç "]) });//é¨é¨
			//model.Add("F_paez_BaseProperty6", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æ»å"])); //æ»å
			//model.Add("F_paez_BaseProperty7", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ç®¡è²"])); //ç®¡è²
			model.Add("F_paez_Assistant", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ççº§"])); //ççº§
			model.Add("F_paez_Text11", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æå°ç®±å·"])); //æå°ç®±å·
			//model.Add("F_paez_Text3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ææ¬"])); //ææ¬
			model.Add("F_paez_Text4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æå¤§ç®±å·"])); //æå¤§ç®±å·
			//model.Add("F_paez_PrintTimes", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æå°æ¬¡æ°"])); //æå°æ¬¡æ°
			//model.Add("F_paez_Text5", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["çº¿å·"])); //æ¡ç æå°
			//model.Add("F_paez_BaseProperty10", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["é¨é¨ä»£ç "]) }); //çäº§é¨é¨
			model.Add("F_paez_Combo1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æ¯å¦åå¤è´¸"])); //æ¯å¦åå¤è´¸
			model.Add("F_paez_Combo2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["äº§åç±»å"])); //äº§åç±»å
			model.Add("F_paez_Combo3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æ»¡çç¶æ"])); //æ»¡çç¶æ
			//model.Add("F_paez_BaseProperty11", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["è§æ ¼åå·"])); //è§æ ¼åå·
			//model.Add("F_paez_BaseProperty12", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ç½å«"])); //ç½å«
			//model.Add("F_TFKO_Text4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ç®±å·åç¼"])); //ç®±å·åç¼
			model.Add("F_paez_WB", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ç½å«"])); //ç½å«1


			JArray Fentity = new JArray();
			foreach (DataRow item in ds.Tables[0].Rows)
			{
			JObject FentityModel = new JObject();
			FentityModel.Add("FMATERIALID", new JObject() { ["FNumber"] = item["ç©æä»£ç "].ToString() }); // ç©æä»£ç
			FentityModel.Add("FUnitID", new JObject() { ["FNumber"] = item["è®¡éåä½ä»£ç "].ToString() }); // åä½ä»£ç
			FentityModel.Add("FQty", item["åé"].ToString()); //åé
			FentityModel.Add("FBASEUNITID", new JObject() { ["FNumber"] = item["åºæ¬è®¡éåä½ä»£ç "].ToString() }); // åºæ¬åä½ä»£ç
			FentityModel.Add("FBASEQTY", item["å®æ¶æ°é"].ToString()); //å®æ¶æ°é
			FentityModel.Add("FSecUNITID", new JObject() { ["FNumber"] = item["åºåè¾è®¡éåä½ä»£ç "].ToString() }); // åºåè¾è®¡éåä½ä»£ç
			FentityModel.Add("FSecQTY", item["åºåè¾åä½å®æ¶æ°é"].ToString()); //å®æ¶æ°éï¼åºåè¾åä½ï¼
			FentityModel.Add("FOWNERTYPEID", item["è´§ä¸»ç±»å"].ToString()); //è´§ä¸»ç±»å
			FentityModel.Add("FOWNERID", new JObject() { ["FNumber"] = item["è´§ä¸»ä»£ç "].ToString() }); // è´§ä¸»ä»£ç
			FentityModel.Add("FKEEPERTYPEID", item["ä¿ç®¡èç±»å"].ToString()); //ä¿ç®¡èç±»å
			FentityModel.Add("FKEEPERID", new JObject() { ["FNumber"] = item["ä¿ç®¡èä»£ç "].ToString() }); // ä¿ç®¡èä»£ç
			FentityModel.Add("FAuxPropId", new JObject() { ["FAUXPROPID__FF100003"] = new JObject() { ["FNumber"] = item["è¾å©å±æ§ä»£ç "].ToString() } }); // è¾å©å±æ§
			FentityModel.Add("FExtAuxUnitId", new JObject() { ["FNumber"] = item["è¾è®¡éåä½ä»£ç "].ToString() }); // è¾è®¡éåä½ä»£ç
			FentityModel.Add("FExtAuxUnitQty", item["ç®±æ°"].ToString()); //ç®±æ°
			FentityModel.Add("F_TFKO_Assistant", new JObject() { ["FNumber"] = item["ç½å«ä»£ç "].ToString() }); // ç½å«
			FentityModel.Add("F_TFKO_Assistant1", new JObject() { ["FNumber"] = item["ååä»£ç "].ToString() }); // åå
			FentityModel.Add("F_TFKO_Assistant2", new JObject() { ["FNumber"] = item["è²æ³½ä»£ç "].ToString() }); // è²æ³½
			FentityModel.Add("F_TFKO_Assistant3", new JObject() { ["FNumber"] = item["çº¤åº¦ä»£ç "].ToString() }); // çº¤åº¦
			FentityModel.Add("F_paez_Qty", item["æ¯é"].ToString()); //æ¯é
			FentityModel.Add("F_TFKO_Text1", item["ç®¡è²"].ToString()); //ç®¡è²
			FentityModel.Add("F_TFKO_Text2", item["æ»å"].ToString()); //æ»å
			FentityModel.Add("FBoxcode", item["ç®±å·"].ToString()); //ç®±å·
			FentityModel.Add("F_PAEZ_SQSL", item["ç³è¯·åæ°é"].ToString()); //ç³è¯·åæ°é
			FentityModel.Add("F_paez_Integer4", item["çåæ°"].ToString()); //çåæ°
			FentityModel.Add("F_paez_BaseQty", item["å®åæ°é"].ToString()); //å®åæ°é
			FentityModel.Add("F_paez_Qty1", item["å®æ¶æ°é"].ToString()); //å®æ¶æ°é
			FentityModel.Add("F_paez_Text2", item["ç®±å·"].ToString()); //ç®±å·


			//JArray Fentity2 = new JArray();
			//JObject FentityModel2 = new JObject();
			//FentityModel2.Add("FEntity_Link_FFlowId", item["FEntity_Link_FFlowId"].ToString());
			//FentityModel2.Add("FEntity_Link_FFlowLineId", item["FEntity_Link_FFlowLineId"].ToString());
			//FentityModel2.Add("FEntity_Link_FRuleId", item["FEntity_Link_FRuleId"].ToString());
			//FentityModel2.Add("FEntity_Link_FSTableName", item["FEntity_Link_FSTableName"].ToString());
			//FentityModel2.Add("FEntity_Link_FSBillId", item["FEntity_Link_FSBillId"].ToString());
			//FentityModel2.Add("FEntity_Link_FSId", item["FEntity_Link_FSId"].ToString());
			//Fentity2.Add(FentityModel2);
			//FentityModel.Add("FEntity_Link", Fentity2);
			//FentityModel.Add("FBFLowId", new JObject() { ["FID"] = item["FBFLOWID"].ToString() });
			Fentity.Add(FentityModel);
			}
			model.Add("FEntity", Fentity); //æç»ä¿¡æ¯
			JObject jsonRoot = new JObject()
			{
			["Creator"] = "",
			["NeedUpDateFields"] = new JArray(),
			["NeedReturnFields"] = new JArray(),
			//["IsDeleteEntry"] = "true",
			//["SubSystemId"] = "",
			//["IsVerifyBaseDataField"] = "false",
			["IsDeleteEntry"] = "true",
			["SubSystemId"] = "",
			["IsVerifyBaseDataField"] = "true",
			["IsEntryBatchFill"] = "false",
			["ValidateFlag"] = "true",
			["NumberSearch"] = "true",
			["IsAutoAdjustField"] = "false",
			["InterationFlags"] = "",
			["IgnoreInterationFlag"] = "",
			//["IsAutoSubmitAndAudit"] = true,//èªå¨è°ç¨æäº¤åå®¡æ ¸åè½
			["Model"] = model
			};

			//ä»éç½®æä»¶è·å CLOUDç½åãè´¦å¥ä¿¡æ¯ãç»å½ç¨æ·ãç»å½å¯ç
			if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å¥åºç³è¯·ååæ¥è·åç»å½è´¦å·å¯ç å¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			var loginRet = InvokeHelper.Login();
			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			if (isSuccess == 0)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ç»å½éè¶å¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			string result = InvokeHelper.Save("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(jsonRoot));//ä¿å

			if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			LogService.Write(JsonConvert.SerializeObject(jsonRoot));
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å¥åºç³è¯·ååæ¥éè¶äºå¤±è´¥ï¼åå·:" + HSourceBillNo_TB + result + jsonRoot;
			objJsonResult.data = null;
			return objJsonResult;
			}

			//æäº¤å®¡æ ¸
			string result1 = string.Empty;
			string result2 = string.Empty;
			var fID = JObject.Parse(result)["Result"]["Id"].ToString();
			var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
			var json = new
			{
			Ids = fID,
			};
			if (oSystemParameter.omodel.Kf_StockInRequestBill_AutoCheck == "Y") //ç³»ç»åæ° èªå¨å®¡æ ¸
			{
			result1 = InvokeHelper.Submit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//æäº¤
			result2 = InvokeHelper.Audit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//å®¡æ ¸

			if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å¥åºç³è¯·ååå·:" + ",æäº¤å¤±è´¥" + result1;
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å¥åºç³è¯·ååå·:" + ",å®¡æ ¸å¤±è´¥" + result2;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			}
			}
			}
			}
			else
			{
			sJXCode = sBarCode;