收料单同步添加“是否赠品”字段，退料模块扫码添加修改旧物料编码判断

yusijie

2024-03-05 23f307369fcf6dd802c1098a14e0b7ea5d68e613

收料单同步添加“是否赠品”字段，退料模块扫码添加修改旧物料编码判断

 WebAPI/Controllers/POStockInBillController.cs

@@ -4437,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());
@@ -5063,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
@@ -5146,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();

 WebAPI/Controllers/条码管理/WEBSController.cs

@@ -952,7 +952,7 @@
                        DataSet ds_material;
                        ds_material = oCn.RunProcReturn(" select FMATERIALID from AIS20220914133941..T_BD_MATERIAL where FNumber = '" + HMaterNumber + "' and FUSEORGID = " + HStockOrgID, "T_BD_MATERIAL");

                        if (ds_material != null || ds_material.Tables[0].Rows.Count > 0)
                        if (ds_material != null && ds_material.Tables[0].Rows.Count > 0)
                        {                         
                            HMaterID = ds_material.Tables[0].Rows[0]["FMATERIALID"].ToString();
                        }
@@ -962,7 +962,7 @@
                            DataSet ds_material_old;
                            ds_material_old = oCn.RunProcReturn(" select FMATERIALID from AIS20220914133941..T_BD_MATERIAL where FOldNumber = '" + HMaterNumber + "' and FUSEORGID =" + HStockOrgID, "T_BD_MATERIAL");

                            if (ds_material_old != null || ds_material_old.Tables[0].Rows.Count > 0)
                            if (ds_material_old != null && ds_material_old.Tables[0].Rows.Count > 0)
                            {
                                HMaterID = ds_material_old.Tables[0].Rows[0]["FMATERIALID"].ToString();
                            }