From 7e35fc76661ff4a26d24cc8912e2534576be85be Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 14 七月 2022 10:27:13 +0800
Subject: [PATCH] 优化

---
 WebAPI/Controllers/POInStockController.cs |  187 +++-------------------------------------------
 1 files changed, 12 insertions(+), 175 deletions(-)

diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index f3d1c6e..70aab5e 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/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
             {
                 //閲囪喘璁㈠崟涓嬫帹鐢熸垚閫佽揣鍗� 鏃跺�� 鍒ゆ柇鏄惁鏈夌敓鎴愰噰璐鍗曞彉鏇村崟 濡傛灉鏈変笖鍙樻洿鍗曠姸鎬佷笉涓哄凡瀹℃牳 闄愬埗涓嬫帹

--
Gitblit v1.9.1