From f165ef7e3b194d59d05e999d4106953aca05f55a Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 10 八月 2022 20:06:57 +0800
Subject: [PATCH] 优化 送货单批量删除

---
 WebAPI/Controllers/POInStockController.cs |  740 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 559 insertions(+), 181 deletions(-)

diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index ccb5618..8c06a45 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -13,6 +13,8 @@
 using System.Web.Http;
 using WebAPI.Code;
 using WebAPI.Models;
+using WebAPI.Utility;
+
 namespace WebAPI.Controllers
 {
     public class POInStockController : ApiController
@@ -156,8 +158,7 @@
                     objjson.data = null;
                     return objjson;
                 }
-                DAL.ClsCg_POInStockBill oClsCg_POInStockBill = new DAL.ClsCg_POInStockBill();
-                ds = oClsCg_POInStockBill.ShowNewBillMainTo(DBUtility.ClsPub.isLong(sMsg), DBUtility.ClsPub.isStrNull(sMsg3), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
+                ds = ShowNewBillMainTo(DBUtility.ClsPub.isLong(sMsg), DBUtility.ClsPub.isStrNull(sMsg3), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objjson.code = "0";
@@ -215,8 +216,7 @@
                     objjson.data = null;
                     return objjson;
                 }
-                DAL.ClsCg_POInStockBill oClsCg_POInStockBill = new DAL.ClsCg_POInStockBill();
-                ds = oClsCg_POInStockBill.ShowNewBillSubTo(DBUtility.ClsPub.isLong(sMsg), DBUtility.ClsPub.isStrNull(sMsg2), DBUtility.ClsPub.isStrNull(sMsg3), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
+                ds = ShowNewBillSubTo(DBUtility.ClsPub.isLong(sMsg), DBUtility.ClsPub.isStrNull(sMsg2), DBUtility.ClsPub.isStrNull(sMsg3), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objjson.code = "0";
@@ -289,7 +289,9 @@
             string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
             string msg2 = sArray[0].ToString();
             string msg3 = sArray[1].ToString();
-
+            //LogService.Write("msg1:" + msg1);
+            //LogService.Write("msg2:" + msg2);
+            //LogService.Write("msg3:" + msg3);
 
             string UserName = "";
             ListModels oListModels = new ListModels();
@@ -343,10 +345,16 @@
                 msg3 = msg3.Replace("\n", "");  //\n
                 //msg2 = msg2.Replace("'", "鈥�");
                 List<Model.ClsCg_POInStockBillSub> ls = new List<Model.ClsCg_POInStockBillSub>();
+
                 ls = oListModels.getObjectByJson_POInStockSub(msg3);
                 int i = 0;
                 foreach (Model.ClsCg_POInStockBillSub oItemSub in ls)
                 {
+                    //鍒ゆ柇閲囪喘璁㈠崟鐘舵�� 
+                    objJsonResult = TestPOOrder(oItemSub.HPOOrderEntryID.ToString());
+                    if (objJsonResult.code == "0")
+                        return objJsonResult;
+                    //澧炲姞鍒ゆ柇 閫佽揣鏁伴噺瓒呭嚭閲囪喘璁㈠崟鏁伴噺
                     i++;
                     if (oItemSub.HQty <= 0)
                     {
@@ -447,19 +455,17 @@
                 if (msg.Trim() == "")
                 {
                     msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
-                    // msg = " Where   hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
                 }
                 else
                 {
                     msg = msg + " and   hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
-                    // msg = msg + " Where   hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
                 }
                 //杞崲鐗规畩瀛楃
                 if (Common.SQLtoChange(msg, ref VsWhere, ref PcWhere) == false)
                 {
                     objjson.code = "0";
                     objjson.count = 0;
-                    objjson.Message = "鑾峰彇澶辫触";
+                    objjson.Message = "杞崲鐗规畩瀛楃澶辫触";
                     objjson.data = null;
                     return objjson;
                 }
@@ -467,12 +473,12 @@
                 Int64 RowTotal = Common.GetRowTotal("H_v_SRM_POInStockBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
                 //鑾峰彇杩斿洖鏁版嵁
                 ds = oCn.RunProcReturn("exec H_p_SRM_POInStockBillList '" + PcWhere + "'", "H_p_SRM_POInStockBillList");
-                //LogService.Write("exec H_p_SRM_POInStockBillList '" + PcWhere + "'");
+                LogService.Write("閫佽揣鍗曞垪琛ㄥ姞杞絪ql:exec H_p_SRM_POInStockBillList '" + PcWhere + "'");
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objjson.code = "0";
                     objjson.count = 0;
-                    objjson.Message = "鑾峰彇澶辫触";
+                    objjson.Message = "鑾峰彇鎴愬姛锛屾棤鏁版嵁";
                     objjson.data = null;
                     return objjson;
                 }
@@ -621,154 +627,337 @@
                     objjson.data = null;
                     return objjson;
                 }
-
-                //string kdTbaleName = "AIS20211209082932";
-                string kdTbaleName = "AIS20211130140219";//澶忓疂姝e紡
-
-                string sql = string.Format(@"
-SELECT M.HBillNo,B.HINTERID,B.HENTRYID,c.FID,c.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
+                var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
+                string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
+                string sql = string.Empty;
+                DataTable dt = new DataTable();
+                List<string> fidList = new List<string>();
+                string parameterSql = $"select HValue from Xt_SystemParameter where HKey ='Cg_POInStockBill_ErpAduit'";
+                var HValue = oCn.RunProcReturn(parameterSql, "dt").Tables[0].Rows[0][0].ToString();
+                if (HValue == "Y")
+                {
+                    if (FCusName == "鐟炰笌绁�" || 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
 ,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  
- 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
- JOIN {0}..T_PUR_POORDER D ON C.FID =D.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  
+,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER
+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 and FLOCALEID = 2052
+LEFT JOIN  {0}..V_BD_BUYER T4 ON D.FPURCHASERID =T4.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);
-                DataTable dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
-                List<string> 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());
+                        LogService.Write(sql);
+                        //LEFT JOIN  {0}..T_HR_EMPINFO T5 ON D.F_XBKF_BASE1 = T5.FID
 
-                        DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());
+                        dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
+                        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());
 
-                        JObject model = new JObject();
-                        model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = "SLD01_SYS" }); //鍗曟嵁绫诲瀷
-                        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("FOwnerTypeIdHead", "BD_OwnerOrg");//  璐т富绫诲瀷
-                        model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].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());//绋庣巼
+                                DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].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 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());//绋庣巼
 
-                        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();
+                                    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); //鏄庣粏淇℃伅
 
-                            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;
+                                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;
+                                }
+                            }
                         }
                     }
+                    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
+,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 and FLOCALEID = 2052
+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];
+                        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 = "鎿嶄綔鎴愬姛";
@@ -822,7 +1011,7 @@
 
         [Route("DeltetPOInStockBill")]
         [HttpGet]
-        public object DeltetPOInStockBill(string HInterID, string HUserName, string HBillNo)
+        public object DeltetPOInStockBill(string HInterID, string HUserName)
         {
             SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
             try
@@ -830,15 +1019,20 @@
                 DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
                 //鍏堝垹闄� 閲戣澏鏁版嵁
                 objjson = DeleteKingDee(HInterID);
-                LogService.Write(objjson.ToString());
+                //LogService.Write(objjson.ToString());
                 if (objjson.code == "0")
                     return objjson;
 
-                WebAPIController.Add_Log("閫佽揣鍗曞垹闄�", HUserName, "閫佽揣鍗曞垹闄わ紝鍗曞彿锛�" + HBillNo);
                 oCN.BeginTran();
-                oBill.DeleteRelation(ref DBUtility.ClsPub.sExeReturnInfo, Convert.ToInt32(HInterID));
-                oCN.RunProc("Delete From Cg_POInStockBillMain where HInterID = " + HInterID);
-                oCN.RunProc("Delete From Cg_POInStockBillSub where HInterID = " + HInterID);
+                string sql = $"select HInterID,HBillNo from Cg_POInStockBillMain where HInterID in ({HInterID})";
+                DataTable dt = oCN.RunProcReturn(sql, "deleteTable").Tables[0];
+                foreach (DataRow dr in dt.Rows)
+                {
+                    WebAPIController.Add_Log("閫佽揣鍗曞垹闄�", HUserName, "閫佽揣鍗曞垹闄わ紝鍗曞彿锛�" + dr["HBillNo"]);
+                    oBill.DeleteRelation(ref DBUtility.ClsPub.sExeReturnInfo, Convert.ToInt32(dr["HInterID"]));
+                    oCN.RunProc($"Delete From Cg_POInStockBillMain where HInterID in ({dr["HInterID"]})");
+                    oCN.RunProc($"Delete From Cg_POInStockBillSub where HInterID in ({dr["HInterID"]})");
+                }
                 oCN.Commit();
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
@@ -860,51 +1054,70 @@
         //瀹℃牳 鍒犻櫎 鍒犻櫎閲戣澏鏁版嵁搴撳搴� 鏀舵枡閫氱煡鍒版暟鎹�
         public json DeleteKingDee(string hinterid)
         {
+            var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
             SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
             string sql = string.Format("select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain where HERPInterID>0 and hinterid in (" + hinterid + ")");
             string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
             if (FCusName == "澶忓疂鐢靛櫒")
-                sql = "select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain t1 join AIS20211130140219..T_PUR_RECEIVE t2 on t1.HERPInterID = t2.FID where HERPInterID>0 and hinterid in (" + hinterid + ")";
+                sql = $"select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain t1 join {kdTbaleName}..T_PUR_RECEIVE t2 on t1.HERPInterID = t2.FID where HERPInterID>0 and hinterid in (" + hinterid + ")";
+            else if (FCusName.Contains("鐟炰笌绁�") || FCusName == "")
+                sql = $"select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain t1 join {kdTbaleName}..T_PUR_RECEIVE t2 on t1.HERPInterID = t2.FID where HERPInterID>0 and hinterid in (" + hinterid + ")";
             DataTable dt = oCN.RunProcReturn(sql, "deleteDt").Tables[0];
-            if (dt.Rows.Count > 0)
+            if (dt.Rows.Count == 0)
             {
-                foreach (DataRow dr in dt.Rows)
-                {
-                    var sJson = new
-                    {
-                        Numbers = dr["HERPBillNO"].ToString(),
-                        Ids = ""
-                    };
-                    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("");
-                    var result = InvokeHelper.Delete("PUR_ReceiveBill", JsonConvert.SerializeObject(sJson));
-                    LogService.Write("api缁撴灉鍒犻櫎锛�" + result);
-                    if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
-                    {
-                        objjson.code = "0";
-                        objjson.count = 0;
-                        objjson.Message = "瀵瑰簲閲戣澏鏀舵枡閫氱煡鍗曞垹闄ゅけ璐� 锛�" + result;
-                        objjson.data = null;
-                        return objjson;
-                    }
-
-                }
+                objjson.code = "1";
+                objjson.count = 1;
+                objjson.Message = "Sucess锛�";
+                objjson.data = null;
+                return objjson;
+            }
+            List<string> HERPInterIdList = new List<string>();
+            foreach (DataRow dr in dt.Rows)
+            {
+                HERPInterIdList.Add(dr["HERPInterID"].ToString());
+            }
+            var sJson = new
+            {
+                Ids = string.Join(",", HERPInterIdList)
+            };
+            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("");
+            var result = InvokeHelper.Delete("PUR_ReceiveBill", JsonConvert.SerializeObject(sJson));
+            //LogService.Write("api缁撴灉鍒犻櫎锛�" + result);
+            if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+            {
+                //var errorsList = JObject.Parse(result)["Result"]["ResponseStatus"]["Errors"];
+                //List<string> errList = new List<string>();
+                //foreach (var item in errorsList)
+                //{
+                //    errList.Add(item["Message"].ToString()+ "\r\n");
+                //}
+                //string err = string.Join(",", errList);
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "瀵瑰簲閲戣澏鏀舵枡閫氱煡鍗曞垹闄ゅけ璐� 锛乗r\n" + result;
+                objjson.data = null;
+                return objjson;
             }
             objjson.code = "1";
             objjson.count = 1;
             objjson.Message = "Sucess锛�";
             objjson.data = null;
             return objjson;
+
         }
+
+
+
 
         //[Route("POInStockAccept")]
         //[HttpGet]
@@ -981,25 +1194,55 @@
 
 
         [Route("TestSaverPOInStock")]
-        [HttpPost]
+        [HttpGet]
         /// <summary>
         /// 鐢熸垚閫佽揣鍗曞墠楠岃瘉閲戣澏閲囪喘璁㈠崟鏄惁鍒犻櫎鍜屽叧闂紝鐒跺悗鏇存柊鍏宠仈鏁伴噺
         /// </summary>
         /// <param name="HInterID"></param>
         /// <returns></returns>
-        public object TestSaverPOInStock([FromBody] string[] ids)
+        public object TestSaverPOInStock(string ids, string entryids)
         {
-            List<string> mylist = new List<string>(ids.Distinct());
+            List<string> mylist = new List<string>(ids.Split(',').Distinct());
+            List<string> entryList = new List<string>(entryids.Split(',').Distinct());
+            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+            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
             {
+                //閲囪喘璁㈠崟涓嬫帹鐢熸垚閫佽揣鍗� 鏃跺�� 鍒ゆ柇鏄惁鏈夌敓鎴愰噰璐鍗曞彉鏇村崟 濡傛灉鏈変笖鍙樻洿鍗曠姸鎬佷笉涓哄凡瀹℃牳 闄愬埗涓嬫帹
+                objJsonResult = TestPOOrder(entryids);
+                if (objJsonResult.code == "0")
+                    return objJsonResult;
+
                 string HinterID = "";
                 for (int i = 0; i < mylist.Count; i++)
                 {
-                    SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                     //鏇存柊鍏宠仈鏁伴噺
                     HinterID = mylist[i].ToString();
                     oCn.RunProc("exec h_p_SRM_UpDatePPBomRelationQty '" + HinterID + "'");
+                    //鍒ゆ柇鏈叧鑱旀暟閲忔槸鍚︿负0
+                    DataSet ds = oCn.RunProcReturn("select *   from H_v_SRM_POOrderBillList where hmainid='" + HinterID + "'", "H_v_SRM_POOrderBillList");
+                    if (ds != null || ds.Tables[0].Rows.Count > 0)
+                    {
+                        if (ds.Tables[0].Rows[0]["鏈叧鑱旀暟閲�"].ToString() == "0")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鍙凤細" + ds.Tables[0].Rows[0]["鍗曟嵁鍙�"].ToString() + "宸插叏閮ㄧ敓鎴愰�佽揣鍗曪紒";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
                 }
+
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "鎿嶄綔鎴愬姛!";
@@ -1016,5 +1259,140 @@
             }
         }
 
+        /// <summary>
+        /// 楠岃瘉 閲囪喘璁㈠崟
+        /// </summary>
+        /// <param name="entryids">閲囪喘璁㈠崟FENTRYID</param>
+        /// <returns></returns>
+        public JsonResult TestPOOrder(string entryids)
+        {
+            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+            try
+            {
+                var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
+                //楠岃瘉閲戣澏閲囪喘璁㈠崟鏄惁瀛樺湪
+                string sql = string.Format(@"
+select M.HBillNo,B.HMaterID,E.HNumber,E.HName 
+FROM Cg_POOrderBillSub B  
+JOIN Cg_POOrderBillMAIN M ON B.HINTERID = M.HINTERID
+JOIN Gy_Material E ON B.HMaterID = E.HItemID
+LEFT JOIN {1}..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
+WHERE ISNULL(C.FENTRYID,0) = 0
+AND B.HEntryID in ({0})"
+        , entryids, kdTbaleName);
+                DataSet ds = oCn.RunProcReturn(sql, "temp");
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁鍙凤細" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + ",鐗╂枡缂栫爜锛�" + ds.Tables[0].Rows[0]["HNumber"].ToString() + "锛屽搴旂殑閲戣澏閲囪喘璁㈠崟宸插垹闄わ紝涓嶈兘涓嬫帹閫佽揣鍗曪紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                //閲囪喘璁㈠崟涓嬫帹鐢熸垚閫佽揣鍗� 鏃跺�� 鍒ゆ柇鏄惁鏈夌敓鎴愰噰璐鍗曞彉鏇村崟 濡傛灉鏈変笖鍙樻洿鍗曠姸鎬佷笉涓哄凡瀹℃牳 闄愬埗涓嬫帹
+                sql = string.Format(@"
+select M.HBillNo,B.HMaterID,E.HNumber,E.HName,F.FBILLNO
+FROM Cg_POOrderBillSub B  
+JOIN Cg_POOrderBillMAIN M ON B.HINTERID = M.HINTERID
+JOIN Gy_Material E ON B.HMaterID = E.HItemID
+JOIN {1}..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
+LEFT join {1}..T_PUR_POCHANGEENTRY D ON C.FENTRYID = D.FOFENTRYID
+LEFT join {1}..T_PUR_POCHANGE F ON D.FID = F.FID
+where b.HEntryID in ({0})
+and F.FDOCUMENTSTATUS <> 'C'"
+        , entryids, kdTbaleName);
+                ds = oCn.RunProcReturn(sql, "temp");
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁鍙凤細" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + ",鐗╂枡缂栫爜锛�" + ds.Tables[0].Rows[0]["HNumber"].ToString() + "锛屾湁瀵瑰簲閲囪喘璁㈠崟鍙樻洿鍗�:" + ds.Tables[0].Rows[0]["FBILLNO"].ToString() + "鏈鏍革紝涓嶈兘涓嬫帹閫佽揣鍗曪紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鎿嶄綔鎴愬姛!";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "澶辫触锛�" + e.Message.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+
+        /// <summary>
+        /// 閲囪喘璁㈠崟鐢熸垚閫佽揣鍗曟寜閽� 鏄剧ず鍗曟嵁澶�
+        /// </summary>
+        /// <param name="lngBillKey"></param>
+        /// <param name="HBillType"></param>
+        /// <param name="sShowItem"></param>
+        /// <param name="sReturn"></param>
+        /// <returns></returns>
+        public DataSet ShowNewBillMainTo(Int64 lngBillKey, string HBillType, string sShowItem, ref string sReturn)
+        {
+            try
+            {
+                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+                //鏌ヨ涓昏〃
+                DataSet Ds;
+                Ds = oCn.RunProcReturn(" exec h_p_SRM_POInStockBillMain_ForWeb " + lngBillKey.ToString() + ",'" + HBillType + "'", "h_p_SRM_POInStockBillMain_ForWeb");
+                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+                {
+                    sReturn = "鍗曟嵁澶存湭鎵惧埌锛�";
+                    return null;
+                }
+                sReturn = "鏄剧ず鍗曟嵁澶存垚鍔燂紒";
+                return Ds;
+            }
+            catch (Exception e)
+            {
+                sReturn = e.Message;
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// 閲囪喘璁㈠崟鐢熸垚閫佽揣鍗曟寜閽� 鏄剧ず鍗曟嵁浣�
+        /// </summary>
+        /// <param name="lngBillKey"></param>
+        /// <param name="lngBillKey2"></param>
+        /// <param name="HBillType"></param>
+        /// <param name="sShowItem"></param>
+        /// <param name="sReturn"></param>
+        /// <returns></returns>
+        public DataSet ShowNewBillSubTo(Int64 lngBillKey, string lngBillKey2, string HBillType, string sShowItem, ref string sReturn)
+        {
+            string s = "";
+            try
+            {
+                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+                //鏌ヨ涓昏〃
+                DataSet Ds;
+                Ds = oCn.RunProcReturn(" exec h_p_SRM_POInStockBillSub_ForWeb '" + lngBillKey2 + "','" + HBillType + "'", "h_p_SRM_POInStockBillSub_ForWeb");
+                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+                {
+                    sReturn = "鍗曟嵁浣撴湭鎵惧埌锛�";
+                    return null;
+                }
+                sReturn = "鏄剧ず鍗曟嵁浣撴垚鍔燂紒";
+                return Ds;
+            }
+            catch (Exception e)
+            {
+                sReturn = e.Message;  //+ s
+                return null;
+            }
+        }
+
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1