yusijie
2023-07-31 a0f78634a7ae3a088ee611a3b2e860dee6ca8367
WebAPI/Controllers/POStockInBillController.cs
@@ -995,15 +995,12 @@
                        bool flag3 = dataSet5.Tables[0].Rows.Count > 0;
                        if (!flag3)
                        {
                            POStockInBillController postockInBillController = new POStockInBillController();
                            //扫源单方法
                            postockInBillController.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo);
                            //POStockInBillController postockInBillController = new POStockInBillController();
                            ////扫源单旧方法
                            //postockInBillController.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo);
                            //WEBSController webscontroller4 = new WEBSController();
                            //object obj4 = webscontroller4.Get_SourceBarCode_PoStockIn_Json(hinterid, HBillNo, HBillType, text5, "1103", HMaker, HOrgID,1, oSystemParameterMain, ref DBUtility.ClsPub.sErrInfo);
                            WEBSController webscontroller4 = new WEBSController();
                            object obj4 = webscontroller4.get_SourceBarCode_POStockIn_Json(hinterid, HBillNo, HBillType, text5, "1103", HMaker, HOrgID);
                        }
                    }
                    else
@@ -1066,8 +1063,12 @@
                        bool flag4 = dataSet6.Tables[0].Rows.Count > 0;
                        if (!flag4)
                        {
                            POStockInBillController postockInBillController2 = new POStockInBillController();
                            postockInBillController2.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo);
                            //旧方法
                            //    POStockInBillController postockInBillController2 = new POStockInBillController();
                            //    postockInBillController2.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo);
                            WEBSController webscontroller4 = new WEBSController();
                            object obj4 = webscontroller4.get_SourceBarCode_POStockIn_Json(hinterid, HBillNo, HBillType, text5, "1103", HMaker, HOrgID);
                        }
                    }
                }
@@ -4294,6 +4295,7 @@
                ClsCg_POInStockBill clsCg_POInStockBill = new ClsCg_POInStockBill();
                string hinterID = list[0].HInterID;
                string text2 = list[0].FID;
                long HDeptID = list[0].HDeptID; //收料部门
                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);
@@ -4304,6 +4306,7 @@
                bool flag = singleSystemParameter.Contains("安瑞");
                bool flag2 = flag;
                bool flag3 = flag2;
                //安瑞
                if (flag3)
                {
                    DataSet dataSet = this.oCn.RunProcReturn("exec h_p_ReceiveBill_Fast " + hinterID, "h_p_ReceiveBill_Fast");
@@ -4476,6 +4479,9 @@
                        jobject36.Add(text21, jobject37);
                        jobject33.Add("FPricePoint", 0);
                        jobject.Add("FinanceEntity ", jobject33);
                        jobject.Add("FReceiveDeptId", new JObject() { ["Fnumber"] = HDeptID.ToString() }); //收料部门ID
                        JObject jobject38 = new JObject();
                        jobject38["Creator"] = "";
                        jobject38["NeedUpDateFields"] = new JArray();
@@ -4518,6 +4524,7 @@
                        LogService.Write("收料通知单审核无数据:" + empty, "Vlog", true);
                    }
                }
                //其他客户
                else
                {
                    JObject jobject40 = new JObject();
@@ -4573,6 +4580,7 @@
                        return this.objJsonResult;
                    }
                }
                //提交,审核
                var f__AnonymousType = new
                {
                    Ids = text2