优化

王 垚

2022-07-14 7e35fc76661ff4a26d24cc8912e2534576be85be

优化

 WebAPI/Controllers/POInStockController.cs

@@ -791,7 +791,7 @@
                        }
                    }
                }
                else if (FCusName == "")
                else if (FCusName == "夏宝电器")
                {
                    sql = string.Format(@"
SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
@@ -817,8 +817,6 @@
LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID  
 WHERE b.hinterid in ({1}) and M.HERPInterID = 0
", kdTbaleName, HInterID);
                    //LEFT JOIN  {0}..T_HR_EMPINFO T5 ON D.F_XBKF_BASE1 = T5.FID

                    dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
                    if (dt.Rows.Count > 0)
                    {
@@ -828,9 +826,7 @@
                                continue;
                            else
                                fidList.Add(dr["FID"].ToString() + dr["HINTERID"].ToString());

                            DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());

                            JObject model = new JObject();
                            string fTypeName = "SLD01_SYS";//标准采购订单类型
                            string ywTypeName = "CG";//标准业务类型
@@ -890,7 +886,6 @@
                                Fentity.Add(FentityModel);
                            }
                            model.Add("FDetailEntity", Fentity); //明细信息

                            JObject _FentityModel = new JObject();
                            _FentityModel.Add("FSettleOrgId", new JObject() { ["Fnumber"] = dr["FSETTLEORGNUMBER"].ToString() }); //  结算组织  
                            _FentityModel.Add("FSettleCurrId", new JObject() { ["Fnumber"] = dr["FSETTLECURRNUMBER"].ToString() }); //  结算币别
@@ -946,175 +941,15 @@
                                return objjson;
                            }
                        }

                    }
                }
                else
                {
                    sql = string.Format(@"
SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
,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,D.F_XBKF_COMBO1,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER,D.F_XBKF_BASE1,isnull(T5.FNUMBER,'') AS FRECEIVEMENNUMBER
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
LEFT JOIN {0}..T_BD_MATERIAL CM ON C.FMATERIALID =CM.FMATERIALID
LEFT JOIN {0}..T_BD_UNIT CU ON C.FUNITID =CU.FUNITID
JOIN {0}..T_PUR_POORDERENTRY_D CD ON    C.FENTRYID = CD.FENTRYID
LEFT JOIN {0}..T_ORG_ORGANIZATIONS CDOO ON CD.FRECEIVEORGID = CDOO.FORGID
JOIN {0}..T_PUR_POORDERENTRY_F CR ON    C.FENTRYID = CR.FENTRYID
LEFT JOIN {0}..T_ORG_ORGANIZATIONS CROO ON CR.FSETTLEORGID = CROO.FORGID
LEFT JOIN {0}..T_PUR_POORDER D ON C.FID =D.FID
LEFT JOIN {0}..T_BAS_BILLTYPE T2 ON D.FBILLTYPEID = T2.FBILLTYPEID
LEFT JOIN {0}..T_BAS_BILLTYPE_L T3 ON T2.FBILLTYPEID = T3.FBILLTYPEID
LEFT JOIN  {0}..V_BD_BUYER T4 ON D.FPURCHASERID =T4.FID
LEFT JOIN  {0}..T_HR_EMPINFO T5 ON D.F_XBKF_BASE1 = T5.FID
LEFT JOIN {0}..T_BD_SUPPLIER DS ON D.FSUPPLIERID = DS.FSUPPLIERID
LEFT JOIN {0}..T_ORG_ORGANIZATIONS DOO ON D.FPURCHASEORGID = DOO.FORGID
JOIN {0}..T_PUR_POORDERFIN E ON C.FID =E.FID
LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID  
 WHERE b.hinterid in ({1}) and M.HERPInterID = 0
", kdTbaleName, HInterID);
                }
                dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
                fidList = new List<string>();
                if (dt.Rows.Count > 0)
                {
                    foreach (DataRow dr in dt.Rows)
                    {
                        if (fidList.Contains(dr["FID"].ToString() + dr["HINTERID"].ToString()))
                            continue;
                        else
                            fidList.Add(dr["FID"].ToString() + dr["HINTERID"].ToString());

                        DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());

                        JObject model = new JObject();
                        string fTypeName = "SLD01_SYS";//标准采购订单类型
                        string ywTypeName = "CG";//标准业务类型
                        if (dr["FTYPENAME"].ToString().Contains("委外"))
                        {
                            fTypeName = "SLD03_SYS";
                            ywTypeName = "WW";
                        }
                        if (dr["FTYPENAME"].ToString().Contains("资产"))
                        {
                            fTypeName = "SLD04_SYS";
                            ywTypeName = "ZCCG";
                        }
                        model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = fTypeName }); //单据类型
                        model.Add("FBusinessType", ywTypeName); //业务类型
                        model.Add("FBILLNO", dr["HBillNo"].ToString()); //单据编号
                        model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //通知日期
                        model.Add("FStockOrgId", new JObject() { ["Fnumber"] = dr["FRECEIVENUMBER"].ToString() }); // 收料组织 
                        model.Add("FPurOrgId", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() }); //采购组织
                        model.Add("FSupplierId", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() }); //供应商
                        model.Add("FPURCHASERID", new JObject() { ["Fnumber"] = dr["FPURCHASERNUMBER"].ToString() }); //采购员
                        model.Add("F_xbkf_Base", new JObject() { ["Fnumber"] = dr["FRECEIVEMENNUMBER"].ToString() }); //收料员
                        model.Add("FOwnerTypeIdHead", "BD_Supplier");//  货主类型
                        model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() });//货主 供应商 
                        model.Add("F_XBKF_COMBO", dr["F_xbkf_Combo1"].ToString());//是否有票 
                        JArray Fentity = new JArray();
                        foreach (var item in drs)
                        {
                            JObject FentityModel = new JObject();
                            FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = item["FMATERIALNUMBER"].ToString() }); // 物料编码   
                            FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 单位   
                            FentityModel.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); //预计到货日期   
                            FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 计价单位   
                            FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); //  库存单位   
                            FentityModel.Add("FActReceiveQty", Convert.ToDecimal(item["HQTY"])); // 供应商送货数量（提料计划数量 - 已生成送货单数量）
                            FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//货主类型
                            FentityModel.Add("FOwnerID", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() });//货主 
                            FentityModel.Add("FSrcId", item["FID"].ToString());//源单内码
                            FentityModel.Add("FSRCFORMID", "PUR_PurchaseOrder");//源单类型
                            FentityModel.Add("FSrcBillNo", item["FBILLNO"].ToString());//源单单号
                            FentityModel.Add("FSRCENTRYID", item["FENTRYID"].ToString());//源单分录内码
                            FentityModel.Add("FORDERBILLNO", item["FBILLNO"].ToString());//源单单号
                            FentityModel.Add("FPOORDERENTRYID", item["FENTRYID"].ToString());//源单分录内码
                            FentityModel.Add("FSRMENTRYID", item["HENTRYID"].ToString());//SRM hentryid
                            FentityModel.Add("FPrice", item["FPRICE"].ToString());//单价
                            FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//含税单价
                            FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//税率

                            JArray Fentity2 = new JArray();
                            JObject FentityModel2 = new JObject();
                            FentityModel2.Add("FDetailEntity_Link_FRULEID", "PUR_PurchaseOrder-PUR_ReceiveBill");
                            FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry");
                            FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FID"].ToString());
                            FentityModel2.Add("FDetailEntity_Link_FSId", item["FEntryID"].ToString());
                            Fentity2.Add(FentityModel2);
                            FentityModel.Add("FDetailEntity_Link", Fentity2);
                            Fentity.Add(FentityModel);
                        }
                        model.Add("FDetailEntity", Fentity); //明细信息

                        JObject _FentityModel = new JObject();
                        _FentityModel.Add("FSettleOrgId", new JObject() { ["Fnumber"] = dr["FSETTLEORGNUMBER"].ToString() }); //  结算组织  
                        _FentityModel.Add("FSettleCurrId", new JObject() { ["Fnumber"] = dr["FSETTLECURRNUMBER"].ToString() }); //  结算币别
                        _FentityModel.Add("FPricePoint", 0); //  定价时点
                        model.Add("FinanceEntity ", _FentityModel);//财务信息
                        JObject jsonRoot = new JObject()
                        {
                            ["Creator"] = "",
                            ["NeedUpDateFields"] = new JArray(),
                            ["NeedReturnFields"] = new JArray(),
                            ["IsDeleteEntry"] = "false",
                            ["SubSystemId"] = "",
                            ["IsVerifyBaseDataField"] = "false",
                            ["Model"] = model
                        };
                        var loginRet = InvokeHelper.Login();
                        var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                        if (isSuccess == 0)
                        {
                            objjson.code = "0";
                            objjson.count = 0;
                            objjson.Message = loginRet;
                            objjson.data = null;
                            return objjson;
                        }
                        LogService.Write("jsonRoot:" + jsonRoot.ToString());
                        var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
                        //LogService.Write(result);
                        if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
                        {
                            //更新送货单 主表 ERP单据号 以及 ERP主内玛
                            string FBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
                            string FID = JObject.Parse(result)["Result"]["Id"].ToString();

                            string updateSql = string.Format(@"
                                                      update a set 
                                                      a.HERPInterID = {0} ,
                                                      a.HERPBillNO   ='{1}'
                                                      from Cg_POInStockBillMain a
                                                      join Cg_POInStockBillSub b on a.hinterid = b.hinterid
                                                      where b.HInterID = ({2})
                                                      and b. HSOURCEINTERID = {3}
                                                      and a.HERPInterID = 0
                                                     ", FID, FBillNo, dr["HINTERID"].ToString(), dr["FID"].ToString());
                            oCn.RunProc(updateSql);
                        }
                        else
                        {
                            objjson.code = "0";
                            objjson.count = 0;
                            objjson.Message = result;
                            objjson.data = null;
                            return objjson;
                        }
                    }

                }
                //更新主表状态 审核
                sql = string.Format(@"update Cg_POInStockBillMain set 
HBillStatus = 2 ,
HChecker   ='{0}',
HCheckDate   = getdate()
where HInterID in ({1})", CurUserName, HInterID);

                oCn.RunProc(sql);

                objjson.code = "1";
                objjson.count = 1;
                objjson.Message = "操作成功";
@@ -1342,14 +1177,16 @@
            List<string> mylist = new List<string>(ids.Split(',').Distinct());
            List<string> entryList = new List<string>(entryids.Split(',').Distinct());
            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
            //if (mylist.Count > 1)
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "操作失败！请选择相同采购订单数据行下推！";
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}
            string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
            if (FCusName == "夏宝电器" && mylist.Count > 1)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "操作失败！请选择相同采购订单数据行下推！";
                objJsonResult.data = null;
                return objJsonResult;
            }

            try
            {
                //采购订单下推生成送货单 时候 判断是否有生成采购订单变更单 如果有且变更单状态不为已审核 限制下推

 WebAPI/Controllers/WebAPIController.cs

@@ -188,10 +188,12 @@
                string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
                LogService.Write(FCusName);
                LogService.Write("DBUtility.ClsPub.StrToPsd(PassWord.Trim()):" + DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
                if (FCusName == "夏宝电器")
                    ds = CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
                else
                    ds = CheckCzymc(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
                //if (FCusName == "夏宝电器")
                //    ds = CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
                //else
                //    ds = CheckCzymc(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));

                ds = CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";