MES-WEB-API.git

			@@ -4374,7 +4374,7 @@
			sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOrgID, HBillNo, HMaker);
			SourceFlag = true;
			}
			else if(oSystemParameter.omodel.WMS_CampanyName == "æ·»åº·" && HSourceBillType == "1241")
			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 + "'";
			@@ -4398,7 +4398,7 @@
			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);
			sql = string.Format(@"select * from {0}..TFKO_t_Cust100009 with(nolock) where FBILLNO = '" + HSourceBillNo_TB + "'", HDataBaseName);

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

			@@ -4407,6 +4407,9 @@
			if (ds == null \|\| ds.Tables[0].Rows.Count < 1)
			{
			sql = "exec h_p_Kf_StockInRequestBillToErp '" + HSourceInterID + "','" + HSourceBillNo_TB + "'";

			LogService.Write("å¶ä»å¥åºè·åæºåä¿¡æ¯ï¼" + sql);

			ds = oCn.RunProcReturn(sql, "h_p_Kf_StockInRequestBillToErp");

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			@@ -4423,23 +4426,23 @@
			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("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_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", new JObject() { ["FSTAFFNUMBER"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["å·¥å·"]) }); //å·¥å· ???å¿å¡« FSTAFFNUMBER
			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_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_Base1", new JObject() { ["FNumber"] = 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]["ç®±é"])); //ç®±é
			@@ -4447,7 +4450,7 @@
			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_Assistant", new JObject() { ["FNumber"] = 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]["æå¤§ç®±å·"])); //æå¤§ç®±å·
			@@ -4460,32 +4463,31 @@
			//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

			model.Add("F_paez_WB", new JObject() { ["FNumber"] = 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("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("FOWNERTYPEID", item["è´§ä¸»ç±»å"].ToString()); //è´§ä¸»ç±»å ???æ°å¼
			FentityModel.Add("FOWNERID", new JObject() { ["FNumber"] = item["è´§ä¸»ä»£ç "].ToString() }); // è´§ä¸»ä»£ç
			FentityModel.Add("FKEEPERTYPEID", 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_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_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_paez_Qty", item["æ¯é"].ToString()); //æ¯é ???ä¸è½å°äºçäº0
			FentityModel.Add("F_TFKO_Text1", item["ç®¡è²"].ToString()); //ç®¡è²
			FentityModel.Add("F_TFKO_Text2", item["æ»å"].ToString()); //æ»å
			FentityModel.Add("FBoxcode", item["ç®±å·"].ToString()); //ç®±å·
			@@ -4493,7 +4495,8 @@
			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()); //ç®±å·
			FentityModel.Add("F_paez_Text2", item["ç®±å·"].ToString()); //ç®±å· ???ä¸è½ä¸ºæ°å
			FentityModel.Add("FLOT", new JObject() { ["FNumber"] = item["æ¹å·"].ToString() }); // è¾è®¡éåä½ä»£ç


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

			LogService.Write("å¶ä»å¥åº,å³å°ç»å½éè¶");
			var loginRet = InvokeHelper.Login();
			LogService.Write("å¶ä»å¥åº,ç»å½éè¶ç»æ1ï¼" + loginRet);
			LogService.Write("å¶ä»å¥åº,ç»å½éè¶ç»æ2ï¼" + JObject.Parse(loginRet)["LoginResultType"].Value<int>());

			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			if (isSuccess == 0)
			{
			oCn.RollBack();
			LogService.Write("å¶ä»å¥åº,ç»å½éè¶å¤±è´¥ï¼");
			//oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ç»å½éè¶å¤±è´¥ï¼";
			@@ -4559,8 +4566,8 @@

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

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

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