新增设备工艺参数订单点检表相关调用方法等

yxj

2024-06-18 951587f554b2daabb19f969d17811b7bfedf6b44

 WebAPI/Controllers/POStockInBillController.cs

@@ -995,12 +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);



@@ -1066,8 +1066,11 @@
                        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);
                        }
                    }
                }
@@ -3918,8 +3921,8 @@
                List<Model.ClsKf_POStockInBillMain> lsmain = new List<Model.ClsKf_POStockInBillMain>();
                ListModels oListModels = new ListModels();
                lsmain = oListModels.getPOStockInBillMainByJson(msg1);
                lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                string sSourceBillType = lsmain[0].HBillType;

                WebAPI.WebS.ClsKf_POStockInBillMain websLsmain = new WebS.ClsKf_POStockInBillMain();
@@ -4436,6 +4439,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());
@@ -5057,6 +5061,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
@@ -5140,6 +5145,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();