安瑞WMS网页后端API
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
yusijie
2024-03-05 23f307369fcf6dd802c1098a14e0b7ea5d68e613 
 WebAPI/Controllers/POStockInBillController.cs


@@ -969,7 +969,7 @@


                    string text4 = ClsPub.isStrNull(dataSet2.Tables[0].Rows[0]["HModel"]);


                    long num3 = (long)ClsPub.isInt(dataSet2.Tables[0].Rows[0]["HUnitID"]);


                    text = str3 + num2.ToString() + text2  + "#" + num;


                    text1 = str3 + num2.ToString() + text2;


                    text1 = str3 + num2.ToString() + text2;//组织代码+物料id+批号


                    //找源单


                    DataSet dataSet3 = clsCN.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FSRCBILLNO= '" + str2 + "' and  FLOT_TEXT = '" + text2 + "' and  FMATERIALID = " + num2.ToString(), "h_v_RECEIVEQuery");


                    //DataSet dataSet3 = clsCN.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FLOT_TEXT= '" + text2 + "' and FPRODUCEDATE = '" + dateTime + "' and  FMATERIALID = " + num2.ToString(), "h_v_RECEIVEQuery");


@@ -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);


                        }


                    }


                }


@@ -1431,7 +1432,8 @@


                        text = str9 + num35.ToString() + text25 + "#" + num34;


                        text1 = str9 + num35.ToString() + text25;


                        DataSet dataSet21 = clsCN4.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + text1 + "'", "Gy_BarCodeBill");


                        bool flag15 = dataSet21.Tables[0].Rows.Count > 0;


                        bool flag15 = dataSet21.Tables[0].Rows.Count > 0;                       




                        if (!flag15)


                        {


                            string billCode4 = "85";


@@ -3448,7 +3450,7 @@


                //如果存在 再判断扫码临时表是否存在该条码


                //如果不存在  进行扫源单的方法


                DataSet Dss5;


                Dss5 = oCn.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill");


                Dss5 = oCn.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "' and HSourceBillNo='" + HSourceBillNo + "'", "Gy_BarCodeBill");


                if (Dss5.Tables[0].Rows.Count > 0)


                {


                    DataSet ds;


@@ -4293,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);


@@ -4303,10 +4306,19 @@


                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");


                    DataRow dataRow = dataSet.Tables[0].Rows[0];


                    if (dataSet.Tables[0].Rows.Count == 1 && dataSet.Tables[0].Rows[0]["FRECEIVENumber"].ToString() == "0")


                    {


                        this.objJsonResult.code = "0";


                        this.objJsonResult.count = 0;


                        this.objJsonResult.Message = "存在多个采购订单单据类型，不允许提交！";


                        this.objJsonResult.data = null;


                        return this.objJsonResult;


                    }


                    bool flag4 = dataSet.Tables[0].Rows.Count <= 0;


                    bool flag5 = flag4;


                    bool flag6 = flag5;


@@ -4425,6 +4437,7 @@


                            jobject16.Add("FSRCENTRYID", dataRow2["FENTRYID"].ToString());


                            jobject16.Add("FORDERBILLNO", dataRow2["FBILLNO"].ToString());


                            jobject16.Add("FPOORDERENTRYID", dataRow2["FENTRYID"].ToString());


                            jobject16.Add("FGiveAway", dataRow2["FGIVEAWAY"].ToString());//是否赠品


                            //jobject16.Add("FPrice", dataRow2["FPRICE"].ToString());


                            //jobject16.Add("FTaxPrice", dataRow2["FTAXPRICE"].ToString());


                            //jobject16.Add("FEntryTaxRate", dataRow2["FTAXRATE"].ToString());


@@ -4467,6 +4480,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();


@@ -4509,6 +4525,7 @@


                        LogService.Write("收料通知单审核无数据：" + empty, "Vlog", true);


                    }


                }


                //其他客户


                else


                {


                    JObject jobject40 = new JObject();


@@ -4564,6 +4581,7 @@


                        return this.objJsonResult;


                    }


                }


                //提交，审核


                var f__AnonymousType = new


                {


                    Ids = text2


@@ -5046,6 +5064,7 @@


,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER  AS FSETTLEORGNUMBER,


E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID 


,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER


,C.FGIVEAWAY AS FGIVEAWAY


FROM CG_POINSTOCKBILLSUB B  


JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID


JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID


@@ -5129,6 +5148,7 @@


                                FentityModel.Add("FPrice", item["FPRICE"].ToString());//单价


                                FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//含税单价


                                FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//税率


                                FentityModel.Add("FGiveAway", item["FGIVEAWAY"].ToString());//是否赠品




                                JArray Fentity2 = new JArray();


                                JObject FentityModel2 = new JObject();