From 0e811802613977f94d899c4c6af05ec4574e9a18 Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期四, 30 三月 2023 09:30:14 +0800 Subject: [PATCH] 1 --- WebAPI/Controllers/POStockInBillController.cs | 405 +++++++++------------------------------------------------ 1 files changed, 69 insertions(+), 336 deletions(-) diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs index 0d614ab..6416cdc 100644 --- a/WebAPI/Controllers/POStockInBillController.cs +++ b/WebAPI/Controllers/POStockInBillController.cs @@ -1112,7 +1112,6 @@ str4 = DBUtility.ClsPub.isStrNull(Dss7.Tables[0].Rows[0]["FNumber"]); } - DataSet dataSet7 = clsCN2.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + str4 + "' and huseorgid = " + HOrgID.ToString(), "Gy_Material"); long num15 = ClsPub.isLong(dataSet7.Tables[0].Rows[0]["HItemID"]); string text14 = ClsPub.isStrNull(dataSet7.Tables[0].Rows[0]["HName"]); @@ -4275,332 +4274,6 @@ [Route("POStockInBillList/AuditPOInStockBillPost_AR")] [HttpPost] - //public object AuditPOInStockBillPost_AR([FromBody] JObject msg) - //{ - // object result; - // try - // { - // string text = msg["msg"].ToString(); - // text = text.Replace("\\", ""); - // text = text.Replace("\n", ""); - // List<ReciveBill_FastModel> list = JsonConvert.DeserializeObject<List<ReciveBill_FastModel>>(text); - // DAL.ClsCg_POInStockBill clsCg_POInStockBill = new DAL.ClsCg_POInStockBill(); - // string hinterID = list[0].HInterID; - // string text2 = list[0].FID; - // string singleSystemParameter = this.oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref ClsPub.sExeReturnInfo); - // string singleSystemParameter2 = this.oSystemParameter.GetSingleSystemParameter("Cg_POInStockBill_ErpAduit", ref ClsPub.sExeReturnInfo); - // string singleSystemParameter3 = this.oSystemParameter.GetSingleSystemParameter("Cg_POInStockBill_BarCodeCtl", ref ClsPub.sExeReturnInfo); - // string configKey = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName"); - // string empty = string.Empty; - // this.oCn.BeginTran(); - // this.oCn.Commit(); - // bool flag = singleSystemParameter.Contains("瀹夌憺"); - // if (flag) - // { - // DataSet dataSet = this.oCn.RunProcReturn("exec h_p_ReceiveBill_Fast " + hinterID, "h_p_ReceiveBill_Fast"); - // DataRow dataRow = dataSet.Tables[0].Rows[0]; - // bool flag2 = dataSet.Tables[0].Rows.Count <= 0; - // if (flag2) - // { - // this.objJsonResult.code = "0"; - // this.objJsonResult.count = 0; - // this.objJsonResult.Message = "鏈壘鍒板搴旂殑鍗曟嵁"; - // this.objJsonResult.data = null; - // return this.objJsonResult; - // } - // bool flag3 = dataSet.Tables[0].Rows.Count >= 0; - // if (flag3) - // { - // JObject jobject = new JObject(); - // string value = "SLD01_SYS"; - // string value2 = "CG"; - // bool flag4 = dataRow["FTYPENAME"].ToString().Contains("濮斿"); - // if (flag4) - // { - // value = "SLD03_SYS"; - // value2 = "WW"; - // } - // bool flag5 = dataRow["FTYPENAME"].ToString().Contains("璧勪骇"); - // if (flag5) - // { - // value = "SLD04_SYS"; - // value2 = "ZCCG"; - // } - // JObject jobject2 = jobject; - // string propertyName = "FBILLTYPEID"; - // JObject jobject3 = new JObject(); - // jobject3["Fnumber"] = value; - // jobject2.Add(propertyName, jobject3); - // jobject.Add("FBusinessType", value2); - // jobject.Add("FBILLNO", dataRow["HBillNo"].ToString()); - // jobject.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); - // JObject jobject4 = jobject; - // string propertyName2 = "FStockOrgId"; - // JObject jobject5 = new JObject(); - // jobject5["Fnumber"] = dataRow["FRECEIVENUMBER"].ToString(); - // jobject4.Add(propertyName2, jobject5); - // JObject jobject6 = jobject; - // string propertyName3 = "FPurOrgId"; - // JObject jobject7 = new JObject(); - // jobject7["Fnumber"] = dataRow["FPURCHASEORGNUMBER"].ToString(); - // jobject6.Add(propertyName3, jobject7); - // JObject jobject8 = jobject; - // string propertyName4 = "FSupplierId"; - // JObject jobject9 = new JObject(); - // jobject9["Fnumber"] = dataRow["FSUPPLIERNUMBER"].ToString(); - // jobject8.Add(propertyName4, jobject9); - // JObject jobject10 = jobject; - // string propertyName5 = "FPURCHASERID"; - // JObject jobject11 = new JObject(); - // jobject11["Fnumber"] = dataRow["FPURCHASERNUMBER"].ToString(); - // jobject10.Add(propertyName5, jobject11); - // jobject.Add("FOwnerTypeIdHead", "BD_Supplier"); - // JObject jobject12 = jobject; - // string propertyName6 = "FOwnerIdHead"; - // JObject jobject13 = new JObject(); - // jobject13["Fnumber"] = dataRow["FSUPPLIERNUMBER"].ToString(); - // jobject12.Add(propertyName6, jobject13); - // jobject.Add("F_RYMA_Assistant", new JObject() { ["Fnumber"] = dataRow["F_UJDY_Assistant"].ToString() }); - // JArray jarray = new JArray(); - // foreach (object obj in dataSet.Tables[0].Rows) - // { - // DataRow dataRow2 = (DataRow)obj; - // JObject jobject14 = new JObject(); - // JObject jobject15 = jobject14; - // string propertyName7 = "FMaterialId"; - // JObject jobject16 = new JObject(); - // jobject16["Fnumber"] = dataRow2["FMATERIALNUMBER"].ToString(); - // jobject15.Add(propertyName7, jobject16); - // JObject jobject17 = jobject14; - // string propertyName8 = "FUnitID"; - // JObject jobject18 = new JObject(); - // jobject18["Fnumber"] = dataRow2["FUNITNUMBER"].ToString(); - // jobject17.Add(propertyName8, jobject18); - // jobject14.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); - // JObject jobject19 = jobject14; - // string propertyName9 = "FPriceUnitId"; - // JObject jobject20 = new JObject(); - // jobject20["Fnumber"] = dataRow2["FUNITNUMBER"].ToString(); - // jobject19.Add(propertyName9, jobject20); - // JObject jobject21 = jobject14; - // string propertyName10 = "FStockUnitID"; - // JObject jobject22 = new JObject(); - // jobject22["Fnumber"] = dataRow2["FUNITNUMBER"].ToString(); - // jobject21.Add(propertyName10, jobject22); - // JObject jobject23 = jobject14; - // string propertyName11 = "FStockID"; - // JObject jobject24 = new JObject(); - // jobject24["Fnumber"] = "BJCK-SH.01.005"; - // jobject23.Add(propertyName11, jobject24); - // jobject14.Add("FActReceiveQty", Convert.ToDecimal(dataRow2["HQTY"])); - // jobject14.Add("FOwnerTypeId", "BD_OwnerOrg"); - // JObject jobject25 = jobject14; - // string propertyName12 = "FOwnerID"; - // JObject jobject26 = new JObject(); - // jobject26["Fnumber"] = dataRow["FPURCHASEORGNUMBER"].ToString(); - // jobject25.Add(propertyName12, jobject26); - // jobject14.Add("FSrcId", dataRow2["FID"].ToString()); - // jobject14.Add("FSRCFORMID", "PUR_PurchaseOrder"); - // jobject14.Add("FSrcBillNo", dataRow2["FBILLNO"].ToString()); - // jobject14.Add("FSRCENTRYID", dataRow2["FENTRYID"].ToString()); - // jobject14.Add("FORDERBILLNO", dataRow2["FBILLNO"].ToString()); - // jobject14.Add("FPOORDERENTRYID", dataRow2["FENTRYID"].ToString()); - // jobject14.Add("FPrice", dataRow2["FPRICE"].ToString()); - // jobject14.Add("FTaxPrice", dataRow2["FTAXPRICE"].ToString()); - // jobject14.Add("FEntryTaxRate", dataRow2["FTAXRATE"].ToString()); - // JObject jobject27 = jobject14; - // string propertyName13 = "FLOT"; - // JObject jobject28 = new JObject(); - // jobject28["Fnumber"] = dataRow2["hbatchno"].ToString(); - // jobject27.Add(propertyName13, jobject28); - // jobject14.Add("FLOT_TEXT", dataRow2["hbatchno"].ToString()); - // jobject14.Add("FProduceDate", dataRow2["HBeginDate"].ToString()); - // jobject14.Add("FExpiryDate", dataRow2["HEndDate"].ToString()); - // jobject14.Add("F_BGP_ShouldQty", dataRow2["F_BGP_ShouldQty"].ToString()); - // //jobject14.Add("F_RYMA_Assistant", dataRow2["F_RYMA_Assistant"].ToString()); - // jobject14.Add("FDetailEntity_Link", new JArray - // { - // new JObject - // { - // { - // "FDetailEntity_Link_FRULEID", - // "PUR_PurchaseOrder-PUR_ReceiveBill" - // }, - // { - // "FDetailEntity_Link_FSTableName", - // "t_PUR_POOrderEntry" - // }, - // { - // "FDetailEntity_Link_FSBillId", - // dataRow2["FID"].ToString() - // }, - // { - // "FDetailEntity_Link_FSId", - // dataRow2["FEntryID"].ToString() - // } - // } - // }); - // jarray.Add(jobject14); - // } - // jobject.Add("FDetailEntity", jarray); - // JObject jobject29 = new JObject(); - // JObject jobject30 = jobject29; - // string propertyName14 = "FSettleOrgId"; - // JObject jobject31 = new JObject(); - // jobject31["Fnumber"] = dataRow["FSETTLEORGNUMBER"].ToString(); - // jobject30.Add(propertyName14, jobject31); - // JObject jobject32 = jobject29; - // string propertyName15 = "FSettleCurrId"; - // JObject jobject33 = new JObject(); - // jobject33["Fnumber"] = dataRow["FSETTLECURRNUMBER"].ToString(); - // jobject32.Add(propertyName15, jobject33); - // jobject29.Add("FPricePoint", 0); - // jobject.Add("FinanceEntity ", jobject29); - // JObject jobject34 = new JObject(); - // jobject34["Creator"] = ""; - // jobject34["NeedUpDateFields"] = new JArray(); - // jobject34["NeedReturnFields"] = new JArray(); - // jobject34["IsDeleteEntry"] = "false"; - // jobject34["SubSystemId"] = ""; - // jobject34["IsVerifyBaseDataField"] = "false"; - // jobject34["Model"] = jobject; - // JObject jobject35 = jobject34; - // string text3 = InvokeHelper.Login(); - // int num = JObject.Parse(text3)["LoginResultType"].Value<int>(); - // bool flag6 = num == 0; - // if (flag6) - // { - // this.objJsonResult.code = "0"; - // this.objJsonResult.count = 0; - // this.objJsonResult.Message = text3; - // this.objJsonResult.data = null; - // return this.objJsonResult; - // } - // string text4 = InvokeHelper.Save("PUR_ReceiveBill", jobject35.ToString()); - // bool flag7 = JObject.Parse(text4)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE"; - // if (!flag7) - // { - // this.objJsonResult.code = "0"; - // this.objJsonResult.count = 0; - // this.objJsonResult.Message = text4; - // this.objJsonResult.data = null; - // return this.objJsonResult; - // } - // string text5 = JObject.Parse(text4)["Result"]["Number"].ToString(); - // text2 = JObject.Parse(text4)["Result"]["Id"].ToString(); - // } - // else - // { - // LogService.Write("鏀舵枡閫氱煡鍗曞鏍告棤鏁版嵁锛�" + empty, "Vlog", true); - // } - // } - // else - // { - // JObject jobject36 = new JObject(); - // jobject36.Add("Creator", ""); - // jobject36.Add("NeedUpDateFields", new JArray()); - // jobject36.Add("NeedReturnFields", new JArray()); - // jobject36.Add("IsDeleteEntry", "false"); - // jobject36.Add("SubSystemId", ""); - // jobject36.Add("IsVerifyBaseDataField", ""); - // JObject jobject37 = new JObject(); - // jobject37.Add("FID", text2); - // JArray jarray2 = new JArray(); - // foreach (ReciveBill_FastModel reciveBill_FastModel in list) - // { - // bool flag8 = reciveBill_FastModel.HSQty == 0m; - // if (!flag8) - // { - // jarray2.Add(new JObject - // { - // { - // "FEntryID", - // reciveBill_FastModel.FEntryID - // }, - // { - // "FActReceiveQty ", - // reciveBill_FastModel.HSQty - // } - // }); - // } - // } - // jobject37.Add("FDetailEntity", jarray2); - // jobject36.Add("Model", jobject37); - // string text6 = InvokeHelper.Login(); - // int num2 = JObject.Parse(text6)["LoginResultType"].Value<int>(); - // bool flag9 = num2 <= 0; - // if (flag9) - // { - // this.objJsonResult.code = "0"; - // this.objJsonResult.count = 0; - // this.objJsonResult.Message = text6; - // this.objJsonResult.data = null; - // return this.objJsonResult; - // } - // string text7 = InvokeHelper.Save("PUR_ReceiveBill", jobject36.ToString()); - // bool flag10 = JObject.Parse(text7)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE"; - // if (flag10) - // { - // LogService.Write("鏀舵枡閫氱煡鍗曚慨鏀瑰け璐sonRoot:" + jobject36.ToString(), "Vlog", true); - // this.objJsonResult.code = "0"; - // this.objJsonResult.count = 0; - // this.objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曟洿鏂板け璐�" + text7; - // this.objJsonResult.data = null; - // return this.objJsonResult; - // } - // } - // var f__AnonymousType = new - // { - // Ids = text2 - // }; - // string text8 = InvokeHelper.Submit("PUR_ReceiveBill", JsonConvert.SerializeObject( f__AnonymousType)); - // JObject jobject38 = JObject.Parse(text8); - // bool flag11 = jobject38["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE"; - // if (flag11) - // { - // LogService.Write("鏀舵枡閫氱煡鍗曟彁浜ゅけ璐sonRoot:" + f__AnonymousType.ToString(), "Vlog", true); - // this.objJsonResult.code = "0"; - // this.objJsonResult.count = 0; - // this.objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曟彁浜ゅけ璐�" + text8; - // this.objJsonResult.data = null; - // result = this.objJsonResult; - // } - // else - // { - // text8 = InvokeHelper.Audit("PUR_ReceiveBill", JsonConvert.SerializeObject( f__AnonymousType)); - // jobject38 = JObject.Parse(text8); - // bool flag12 = jobject38["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE"; - // if (flag12) - // { - // LogService.Write("鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot:" + f__AnonymousType.ToString(), "Vlog", true); - // this.objJsonResult.code = "0"; - // this.objJsonResult.count = 0; - // this.objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot" + text8; - // this.objJsonResult.data = null; - // result = this.objJsonResult; - // } - // else - // { - // this.objJsonResult.code = "1"; - // this.objJsonResult.count = 1; - // this.objJsonResult.Message = "鎿嶄綔鎴愬姛锛�"; - // this.objJsonResult.data = null; - // result = this.objJsonResult; - // } - // } - // } - // catch (Exception ex) - // { - // this.objJsonResult.code = "0"; - // this.objJsonResult.count = 0; - // this.objJsonResult.Message = "寮傚父锛�" + ex.ToString(); - // this.objJsonResult.data = null; - // result = this.objJsonResult; - // } - // return result; - //} - - public object AuditPOInStockBillPost_AR([FromBody] JObject msg) { @@ -4746,9 +4419,9 @@ jobject16.Add("FSRCENTRYID", dataRow2["FENTRYID"].ToString()); jobject16.Add("FORDERBILLNO", dataRow2["FBILLNO"].ToString()); jobject16.Add("FPOORDERENTRYID", dataRow2["FENTRYID"].ToString()); - jobject16.Add("FPrice", dataRow2["FPRICE"].ToString()); - jobject16.Add("FTaxPrice", dataRow2["FTAXPRICE"].ToString()); - jobject16.Add("FEntryTaxRate", dataRow2["FTAXRATE"].ToString()); + //jobject16.Add("FPrice", dataRow2["FPRICE"].ToString()); + //jobject16.Add("FTaxPrice", dataRow2["FTAXPRICE"].ToString()); + //jobject16.Add("FEntryTaxRate", dataRow2["FTAXRATE"].ToString()); JObject jobject29 = jobject16; string text18 = "FLOT"; JObject jobject30 = new JObject(); @@ -4758,7 +4431,10 @@ jobject16.Add("FProduceDate", dataRow2["HBeginDate"].ToString()); jobject16.Add("FExpiryDate", dataRow2["HEndDate"].ToString()); jobject16.Add("F_BGP_ShouldQty", dataRow2["F_BGP_ShouldQty"].ToString()); - jobject16.Add("F_UJDY_Qty", dataRow2["HQTY"].ToString()); + jobject16.Add("FPrice", dataRow2["FPRICE"].ToString()); + jobject16.Add("FTaxPrice", dataRow2["FTAXPRICE"].ToString()); + jobject16.Add("FEntryTaxRate", dataRow2["FTAXRATE"].ToString()); + //jobject16.Add("F_UJDY_Qty", dataRow2["HQTY"].ToString()); JObject jobject31 = jobject16; string text19 = "FDetailEntity_Link"; JArray jarray2 = new JArray(); @@ -4886,14 +4562,14 @@ { Ids = text2 }; - string text27 = InvokeHelper.Submit("PUR_ReceiveBill", JsonConvert.SerializeObject( f__AnonymousType)); + string text27 = InvokeHelper.Submit("PUR_ReceiveBill", JsonConvert.SerializeObject(f__AnonymousType)); JObject jobject43 = JObject.Parse(text27); bool flag31 = jobject43["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE"; bool flag32 = flag31; bool flag33 = flag32; if (flag33) { - LogService.Write("鏀舵枡閫氱煡鍗曟彁浜ゅけ璐sonRoot:" + f__AnonymousType.ToString(), "Vlog", true); + LogService.Write("鏀舵枡閫氱煡鍗曟彁浜ゅけ璐sonRoot:" + f__AnonymousType.ToString(), "Vlog", true); this.objJsonResult.code = "0"; this.objJsonResult.count = 0; this.objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曟彁浜ゅけ璐�" + text27; @@ -4902,14 +4578,14 @@ } else { - text27 = InvokeHelper.Audit("PUR_ReceiveBill", JsonConvert.SerializeObject( f__AnonymousType)); + text27 = InvokeHelper.Audit("PUR_ReceiveBill", JsonConvert.SerializeObject(f__AnonymousType)); jobject43 = JObject.Parse(text27); bool flag34 = jobject43["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE"; bool flag35 = flag34; bool flag36 = flag35; if (flag36) { - LogService.Write("鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot:" + f__AnonymousType.ToString(), "Vlog", true); + LogService.Write("鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot:" + f__AnonymousType.ToString(), "Vlog", true); this.objJsonResult.code = "0"; this.objJsonResult.count = 0; this.objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot" + text27; @@ -4936,6 +4612,63 @@ } return result; } + + + + //public object AuditPOInStockBillPost_AR([FromBody] JObject msg) + //{ + // string msg1 = msg["msg"].ToString(); + // msg1 = msg1.Replace("\\", ""); + // msg1 = msg1.Replace("\n", ""); + // msg1 = msg1.Substring(1, msg1.Length-2); + // try + // { + // List<Model.ClsCg_POInStockBillMain> lsmain = new List<Model.ClsCg_POInStockBillMain>(); + // ListModels oListModels = new ListModels(); + // lsmain = oListModels.getPOInStockBillMainByJson(msg1); + // lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); + // lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); + // string sSourceBillType = "1103"; + + // WebAPI.WebS.ClsCg_POInStockBillMain websLsmain = new WebS.ClsCg_POInStockBillMain(); + + // websLsmain.HInterID = lsmain[0].HInterID; + // websLsmain.HBillNo = lsmain[0].HBillNo; + // //websLsmain.HBillType = "1103";//鍥哄畾鍊� + // websLsmain.HDate = lsmain[0].HDate; + // //websLsmain.HDeptID = lsmain[0].HDeptID; + // //websLsmain.HEmpID = 0; + // //websLsmain.HBillerID = lsmain[0].HBillerID; + // //websLsmain.HRemark = ""; + // //websLsmain.HMainSourceBillType = lsmain[0].HBillType; + + + // if (webserver.set_SavePOInStockBill_NEW_Json(websLsmain, ref DBUtility.ClsPub.sErrInfo)) + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 1; + // objJsonResult.Message = "鎴愬姛锛佸崟鎹彿涓猴細"; + // 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; + // } + //} #region PDA鍏朵粬鍑哄簱 @@ -5675,7 +5408,7 @@ }; string result1 = string.Empty; string result2 = string.Empty; - DataSet Ds = oCn.RunProcReturn("select FDOCUMENTSTATUS,FID from AIS20210811135644..T_PUR_RECEIVE where FBILLNO='" + HBarCode + "'", "AIS20210811135644..T_PUR_RECEIVE"); + DataSet Ds = oCn.RunProcReturn("select FDOCUMENTSTATUS,FID from AIS20220914133941..T_PUR_RECEIVE where FBILLNO='" + HBarCode + "'", "AIS20220914133941..T_PUR_RECEIVE"); //鍒ゆ柇褰撳墠鏀舵枡閫氱煡鍗曠姸鎬佲�斺�斿凡鍒涘缓鍒欏厛鎻愪氦鍐嶅鏍搞�佷互鎻愪氦鍒欏彧瀹℃牳 if (Ds.Tables[0].Rows[0][0].ToString() == "A" || Ds.Tables[0].Rows[0][0].ToString() == "D") { -- Gitblit v1.9.1