From 1440ef9f5e84ba2f4fa7b38b2dae0acbb09b0bdd Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 10 一月 2022 08:49:21 +0800
Subject: [PATCH] 修改了 调拨单扫源单  扫条码方法 基础资料过滤组织

---
 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user |  146 ++++++------
 DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs               |   16 +
 WebAPI/Controllers/MoveStockBillController.cs               |  238 +++++++++++++++---
 WebAPI/Web.config                                           |    4 
 WebAPI/WebAPI.csproj.user                                   |    2 
 WebAPI/WebServer.cs                                         |   50 ++++
 WebAPI/Controllers/WebAPIController.cs                      |  203 ++++++++++++++++
 WebAPI/Controllers/ProductInController.cs                   |   41 +++
 8 files changed, 573 insertions(+), 127 deletions(-)

diff --git a/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs b/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs
index 433fb22..34466ee 100644
--- a/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs
+++ b/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs
@@ -1045,8 +1045,22 @@
             }
         }
 
+        ////鍒犻櫎鍗曟嵁淇℃伅
+        //public bool DeleteBill(Int64 HInterID,long HMaterID,long HAuxPropID,string HMTONo,long HSourceInterID,long HSourceEntryID,string sHBillType)
+        //{
+        //    try
+        //    {
+        //        oCn.RunProc("Delete from " + MvarItemKey + " where HInterID=" + HInterID.ToString() + " and HMaterID= " + HMaterID.ToString() + " and HAuxPropID= " + HAuxPropID.ToString() + " and HMTONo='" + HMTONo + "' and HBillType='" + sHBillType + "' and HSourceInterID=" + HSourceInterID.ToString() + " and HSourceEntryID=" + HSourceEntryID.ToString() + " and HQty<>0 ", ref DBUtility.ClsPub.sExeReturnInfo);
+        //        return true;
+        //    }
+        //    catch (Exception e)
+        //    {
+        //        throw (e);
+        //    }
+        //}
+
         //鍒犻櫎鍗曟嵁淇℃伅
-        public bool DeleteBill(Int64 sHInterID,string HBillNo,string HBillType,string HBarCode)
+        public bool DeleteBill(Int64 sHInterID, string HBillNo, string HBillType, string HBarCode)
         {
             try
             {
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index dea99db..23ad48e 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -221,16 +221,23 @@
         /// <returns></returns>
         [Route("MoveStockBill/get_InfoByBarCode_Source_Json")]
         [HttpGet]
-        public object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker, Int64 HOrgID)
+        public object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker, Int64 HOrgID,string HSourceBillNo,string HSourceBillType)
         {
             try
             {
                 DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
                 SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                 dal.GetInfoByNumber_View(sCode);
+
+             
+
                 if (dal.omodel_View.HBarCodeType != "鎵樼洏鏉$爜")
                 {
-                    return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker, HOrgID);
+                    if (HSourceBillNo == null)
+                    {
+                        HSourceBillNo = "";
+                    }
+                    return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker, HOrgID, HSourceBillNo, HSourceBillType);
                 }
                 else
                 {
@@ -256,7 +263,7 @@
                         for (int i = 0; i < dsTBarCode.Tables[0].Rows.Count; i++)
                         {
                             sBarCode_MX = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCodeMX"]);
-                            objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker,HOrgID);
+                            objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker,HOrgID,HSourceBillNo,HSourceBillType);
                             if (objJsonResult.code == "0")
                             {
                                 return objJsonResult;
@@ -277,7 +284,7 @@
             }
         }
 
-        public object get_InfoByBarCode_Source_Json_s(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker,Int64 HOrgID)
+        public object get_InfoByBarCode_Source_Json_s(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker,Int64 HOrgID,string HSourceBillNo,string HSourceBillType)
         {
             try
             {
@@ -285,7 +292,24 @@
                 string sErrMsg = "";
                 bool sBool = false;
                 double sRelQty = 0;
-                oView = webserver.get_InfoByBarCode_Source(sCode, sInterID, ref sBool, ref DBUtility.ClsPub.sErrInfo);
+                int sRow = 0;
+                long sHMaterID = 0;
+                long sHAuxPropID = 0;
+
+                string[] NewBarCode;
+                if (sCode.CompareTo("#") > 0)
+                {
+                    NewBarCode = sCode.Split(Convert.ToChar("#"));
+                    sCode = NewBarCode[0];
+                }
+
+                string sBarCode = sCode.Trim();
+                string sBarCodePrefix = sBarCode.Substring(0, Math.Min(3, sBarCode.Length));//鎴彇鏉$爜鍓嶄笁浣嶅瓧绗︿覆
+
+                WebS.ClsGy_BarCodeBill_WMS_Model_View oView = new WebS.ClsGy_BarCodeBill_WMS_Model_View();
+                WebS.WebService1 oWebs1 = new WebS.WebService1();
+                oView = oWebs1.get_InfoByBarCode_Source(sCode, sInterID, ref sBool, ref sErrMsg);
+                //oView = webserver.get_InfoByBarCode_Source(sCode, sInterID, ref sBool, ref DBUtility.ClsPub.sErrInfo);
                 if (oView == null)
                 {
                     objJsonResult.code = "0";
@@ -294,18 +318,81 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                if (oView.HBarCodeType == "鍞竴鏉$爜" && sQty > 0 && oView.HQty < sQty)
+                else { 
+                if (HSourceBillNo.Trim() != "")
                 {
-                    sRelQty = oView.HQty;
+                    if (sBool == false)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "璇ョ墿鏂欏苟涓嶅瓨鍦ㄤ簬姝よ皟鎷ㄥ崟,璇风‘璁ょ墿鏂欐棤璇悗閲嶆柊鎵弿锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
                 }
-                else if (sQty > 0)
+                if (oView.HBarCodeType != "鎵樼洏鏉$爜")
                 {
-                    sRelQty = sQty;
+                    if (oView.HBarCodeType == "鍞竴鏉$爜" && sQty > 0 && oView.HQty < sQty)
+                    {
+                        sRelQty = oView.HQty;
+                    }
+                    else if (sQty > 0)
+                    {
+                        sRelQty = sQty;
+                    }
+                    else
+                    {
+                        sRelQty = oView.HQty;
+                    }
+                    if (oView.HBarCodeType != "鍞竴鏉$爜")
+                    {
+                        if (SCWhID == 0)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "璋冨嚭浠撳簱娌℃湁閫夋嫨锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        else
+                        {
+                            if (SCSPID == 0)
+                            {
+                                objJsonResult.code = "0";
+                                objJsonResult.count = 0;
+                                objJsonResult.Message = "璋冨嚭浠撲綅娌℃湁閫夋嫨锛�";
+                                objJsonResult.data = null;
+                                return objJsonResult;
+                            }
+                        }
+                    }
+                    
+                    //if (webserver.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
+                    bool flag = oWebs1.Get_CheckQtyByBarCode_GetWhAndSP(model.HInterID, model.HBillType, model.HBarCode, ref SCWhID, ref SCSPID, sRelQty, ref sRelQty);
+                    if (flag)
+                    {
+                        //sQty = sRelQty;
+                        model.HSCWHID = SCWhID;
+                        model.HOutStockPlaceID = SCSPID;
+                        if (SCWhID <= 0)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "1-浠撳簱鏃犲簱瀛橈紒";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                    else if (sRelQty == 0)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "2-鏃犲簱瀛橈紒";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
                 }
-                else
-                {
-                    sRelQty = oView.HQty;
-                }
+             }
 
                 model.HInterID = DBUtility.ClsPub.isLong(sInterID);
                 model.HBillNo = DBUtility.ClsPub.isStrNull(sBillNo);
@@ -337,49 +424,103 @@
                 model.HPieceQty = 1;
                 model.HSTOCKORGID = HOrgID;
                 model.HOWNERID = HOrgID;
-
-                WebS.WebService1 oWebs = new WebS.WebService1();
-                //if (webserver.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
-                bool flag = oWebs.Get_CheckQtyByBarCode_GetWhAndSP(model.HInterID, model.HBillType, model.HBarCode, ref SCWhID, ref SCSPID, sRelQty, ref sRelQty);
-                if (flag)
+                if(sBool)
                 {
-                    //sQty = sRelQty;
-                    model.HSCWHID = SCWhID;
-                    model.HOutStockPlaceID = SCSPID;
-                    if(SCWhID<=0)
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "1-浠撳簱鏃犲簱瀛橈紒";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
+                    model.HSourceBillType = HSourceBillType;
                 }
-                else if (sRelQty == 0)
+                if(oWebs1.Get_CheckWhAndSP_BeUpdate(SCWhID,SCSPID,ref DBUtility.ClsPub.sErrInfo))
                 {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "2-鏃犲簱瀛橈紒";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-                if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
-                {
-                    objJsonResult.code = "1";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "3-鎵爜鎴愬姛锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
+                   
                 }
                 else
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "4-鎵爜澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+                    objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛涜皟鍑轰粨搴�," + DBUtility.ClsPub.sErrInfo;
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
+                if(model.HWhID == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛涜皟鍏ヤ粨搴撴病鏈夐�夋嫨锛�" + DBUtility.ClsPub.sErrInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                if(sBool)
+                {
+                    if(oWebs.set_SavePonderationBillMain_Temp_Select_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
+                    {
+
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛涙壂鎻忓け璐ワ紒" + DBUtility.ClsPub.sErrInfo;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                else
+                {
+                    if (oView.HBarCodeType != "鎵樼洏鏉$爜")
+                    {
+                        if (HSourceBillType == "涓嬫灦閫氱煡鍗�" && HSourceBillNo != "")
+                        {
+                            if (oWebs.set_SavePonderationBillMain_Temp_FIFO(model, ref DBUtility.ClsPub.sErrInfo))
+                            {
+
+                            }
+                            else
+                            {
+                                objJsonResult.code = "0";
+                                objJsonResult.count = 0;
+                                objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛涙壂鎻忓け璐ワ紒" + DBUtility.ClsPub.sErrInfo;
+                                objJsonResult.data = null;
+                                return objJsonResult;
+                            }
+                        }
+                        else
+                        {
+                            if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
+                            {
+
+                            }
+                            else
+                            {
+                                objJsonResult.code = "0";
+                                objJsonResult.count = 0;
+                                objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛涙壂鎻忓け璐ワ紒" + DBUtility.ClsPub.sErrInfo;
+                                objJsonResult.data = null;
+                                return objJsonResult;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
+                        {
+                           
+                        }
+                        else
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛涙壂鎻忓け璐ワ紒" + DBUtility.ClsPub.sErrInfo;
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                }
+                //return objJsonResult;
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鎵爜鎴愬姛锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
             }
             catch (Exception)
             {
@@ -604,6 +745,8 @@
             {
                 // DataSet ds = new DataSet();
                 // WebServer webserver = new WebServer();
+                WebS.WebService1 oWebs = new WebS.WebService1();
+
                 string sWhere = " Where 鍗曟嵁鍙� like '%" + HSourceBillNo.Trim() + "%'";
                 if (HSourceBillType == "3720")
                 {
@@ -611,7 +754,8 @@
                 }
                 else if (HSourceBillType == "1243")
                 {
-                    ds = webserver.GetKf_MoveStockRequestBillList(sWhere);
+                    //ds = webserver.GetKf_MoveStockRequestBillList(sWhere);
+                    ds = oWebs.GetKf_MoveStockRequestBillList(sWhere);
                 }
                 if (ds == null || ds.Tables[0].Rows.Count <= 0)
                 {
@@ -634,7 +778,7 @@
                         objJsonResult.code = "0";
                         objJsonResult.count = 1;
                         objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
-                        objJsonResult.data = null;
+                        objJsonResult.data = ds.Tables[0];
                         return objJsonResult;
                     }
                     else
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 48559e9..ffcbd25 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -760,9 +760,46 @@
             }
         }
 
+        [Route("ProductIn/Delete_Json_AN")]
+        [HttpGet]
+        public object Delete_Json_AN(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)
+        {
+            string sErrMsg = string.Empty;
+            try
+            {
+                if (webserver.DeleteBill_AN(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType, ref sErrMsg))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
+        }
+
+
         [Route("ProductIn/Delete_Json")]
         [HttpGet]
-        public object Delete_Json(long HInterID,string HBillNo,string HBillType,string HBarCode)
+        public object Delete_Json(long HInterID, string HBillNo, string HBillType, string HBarCode)
         {
             string sErrMsg = string.Empty;
             try
@@ -779,7 +816,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鍒犻櫎澶辫触锛�" ;
+                    objJsonResult.Message = "鍒犻櫎澶辫触锛�";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index bab1e9c..5b8605f 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -456,6 +456,53 @@
             }
         }
 
+        /// <summary>
+        /// 鑾峰彇浠撳簱鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetWarehouseList_Json_New")]
+        [HttpGet]
+        public object GetWarehouseList_Json_New(string Warehouse, Int64 HOrgID)
+        {
+            sWhere = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID =" + HOrgID + "";
+            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+            if (Warehouse != "")
+            {
+                sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%'  or HUSEORGID like '%" + Warehouse + "%' ) ";
+            }
+
+            try
+            {
+                WebS.WebService1 oWeb = new WebS.WebService1();
+                ds = oWeb.GetWarehouseList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
 
 
         /// <summary>
@@ -493,6 +540,72 @@
             try
             {
                 ds = webserver.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+
+        /// <summary>
+        /// 鑾峰彇浠撲綅鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetStockPlaceList_Json_NEW")]
+        [HttpGet]
+        public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID,Int64 HOrgID)
+        {
+            WebS.WebService1 oWeb = new WebS.WebService1();
+            sWhere = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID = " + HOrgID + "";
+            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+            if (HWhID == 0)
+            {
+                if (StockPlace != "")
+                {
+                    sWhere = " Where HStopFlag=0  and ( HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%' ) ";
+                }
+                else
+                {
+                    sWhere = " Where HStopFlag=0 ";
+                }
+            }
+            else
+            {
+                if (StockPlace != "")
+                {
+                    sWhere = " Where HStopFlag=0 and HWHID=" + HWhID.ToString() + " and HWHID=" + HWhID.ToString() + " and ( HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%' ) ";
+                }
+                else
+                {
+                    sWhere = " Where HStopFlag=0 and HWHID=" + HWhID.ToString();
+                }
+            }
+            try
+            {
+                //ds = webserver.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+                ds = oWeb.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
                 if (ds == null || ds.Tables[0].Rows.Count <= 0)
                 {
                     objjson.code = "0";
@@ -731,6 +844,53 @@
             try
             {
                 ds = webserver.GetDepartmentList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+
+        /// <summary>
+        /// 鑾峰彇缁勭粐鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetOrganizationList_Json")]
+        [HttpGet]
+        public object GetOrganizationList_Json()
+        {
+            WebS.WebService1 oWebs1 = new WebS.WebService1();
+            //sWhere = " Where HStopFlag=0  and HEndFlag=1";
+            ////sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+            //if (Organization != "")
+            //{
+            //    sWhere = sWhere + " and ( HNumber like '%" + Organization + "%' or HName like '%" + Organization + "%' ) ";
+            //}
+            try
+            {
+                ds = oWebs1.get_ORGANIZATIONSList();
                 if (ds == null || ds.Tables[0].Rows.Count <= 0)
                 {
                     objjson.code = "0";
@@ -2498,6 +2658,46 @@
         #endregion
 
 
+        ///// <summary>
+        ///// 浜у搧鍏ュ簱缂撳瓨鍒楄〃鍒锋柊淇℃伅
+        ///// </summary>
+        ///// <returns></returns>
+        //[Route("Web/chanpinruk")]
+        //[HttpGet]
+        //public object chanpinruk(string HBillType, string sHMaker, Int64 HOrgID)
+        //{
+        //    try
+        //    {
+        //        ds = webserver.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID);
+        //        if (ds == null || ds.Tables[0].Rows.Count <= 0)
+        //        {
+        //            objJsonResult.code = "0";
+        //            objJsonResult.count = 0;
+        //            objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+        //            objJsonResult.data = null;
+        //            return objJsonResult;
+        //            //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+        //        }
+        //        else
+        //        {
+        //            objJsonResult.code = "0";
+        //            objJsonResult.count = 1;
+        //            objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+        //            objJsonResult.data = ds.Tables[0];
+        //            return objJsonResult;
+        //        }
+        //    }
+        //    catch (Exception e)
+        //    {
+        //        objJsonResult.code = "0";
+        //        objJsonResult.count = 0;
+        //        objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+        //        objJsonResult.data = null;
+        //        return objJsonResult;
+        //    }
+        //}
+
+
         /// <summary>
         /// 浜у搧鍏ュ簱缂撳瓨鍒楄〃鍒锋柊淇℃伅
         /// </summary>
@@ -2506,9 +2706,10 @@
         [HttpGet]
         public object chanpinruk(string HBillType, string sHMaker, Int64 HOrgID)
         {
+            WebS.WebService1 oWebs = new WebS.WebService1();
             try
             {
-                ds = webserver.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID);
+                ds = oWebs.GetKf_PonderationBillMain_TempList_New (HBillType, sHMaker, HOrgID);
                 if (ds == null || ds.Tables[0].Rows.Count <= 0)
                 {
                     objJsonResult.code = "0";
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 6210cc5..e5f010c 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,7 @@
   </PropertyGroup>
   <ItemGroup>
     <File Include="apiapp.json">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>12/23/2021 16:19:08</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.dll">
       <publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,31 +18,31 @@
       <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>12/27/2021 19:22:36</publishTime>
+      <publishTime>01/03/2022 13:39:53</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>12/27/2021 19:22:36</publishTime>
+      <publishTime>01/03/2022 13:39:53</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>12/27/2021 19:22:33</publishTime>
+      <publishTime>01/03/2022 13:39:52</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
-      <publishTime>12/27/2021 19:22:33</publishTime>
+      <publishTime>01/03/2022 13:39:52</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 14:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>12/24/2021 19:54:52</publishTime>
+      <publishTime>12/24/2021 09:26:56</publishTime>
     </File>
     <File Include="bin/DBUtility.pdb">
-      <publishTime>12/24/2021 19:54:52</publishTime>
+      <publishTime>12/24/2021 09:26:56</publishTime>
     </File>
     <File Include="bin/Interop.gregn6Lib.dll">
       <publishTime>08/25/2021 10:28:25</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>08/16/2021 17:23:13</publishTime>
+      <publishTime>12/23/2021 16:19:02</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
       <publishTime>09/20/2018 19:23:20</publishTime>
@@ -60,34 +60,34 @@
       <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>12/27/2021 19:22:29</publishTime>
+      <publishTime>12/29/2021 13:19:19</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>12/27/2021 19:22:29</publishTime>
+      <publishTime>12/29/2021 13:19:19</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>08/03/2014 20:33:56</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>12/24/2021 19:54:49</publishTime>
+      <publishTime>12/24/2021 09:26:55</publishTime>
     </File>
     <File Include="bin/Pub_Class.pdb">
-      <publishTime>12/24/2021 19:54:49</publishTime>
+      <publishTime>12/24/2021 09:26:55</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>12/24/2021 19:54:51</publishTime>
+      <publishTime>12/24/2021 09:26:56</publishTime>
     </File>
     <File Include="bin/Pub_Control.pdb">
-      <publishTime>12/24/2021 19:54:51</publishTime>
+      <publishTime>12/24/2021 09:26:56</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>12/24/2021 19:54:51</publishTime>
+      <publishTime>12/24/2021 09:26:56</publishTime>
     </File>
     <File Include="bin/SQLHelper.pdb">
-      <publishTime>12/24/2021 19:54:51</publishTime>
+      <publishTime>12/24/2021 09:26:56</publishTime>
     </File>
     <File Include="bin/stdole.dll">
       <publishTime>05/09/2021 13:35:37</publishTime>
@@ -156,7 +156,7 @@
       <publishTime>11/28/2018 13:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
       <publishTime>01/28/2015 04:02:18</publishTime>
@@ -189,13 +189,13 @@
       <publishTime>11/24/2014 11:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>12/30/2021 14:47:29</publishTime>
+      <publishTime>01/07/2022 16:40:33</publishTime>
     </File>
     <File Include="bin/WebAPI.dll.config">
       <publishTime>12/15/2021 17:59:43</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>12/30/2021 14:47:29</publishTime>
+      <publishTime>01/07/2022 16:40:33</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>07/17/2013 17:03:52</publishTime>
@@ -207,166 +207,166 @@
       <publishTime>11/29/2018 13:26:30</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:04</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:04</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:04</publishTime>
     </File>
     <File Include="DLL/BLL.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/DAL.dll">
-      <publishTime>10/29/2021 19:50:53</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/DBUtility.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/Model.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/Newtonsoft.Json.Net35.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/Pub_Class.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/Pub_Control.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/SQLHelper.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>12/23/2021 16:19:08</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>12/23/2021 16:19:08</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>12/23/2021 16:19:08</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>12/23/2021 16:19:08</publishTime>
     </File>
     <File Include="Global.asax">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Index.html">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="packages.config">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>12/23/2021 16:19:08</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.min.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.map">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.min.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/modernizr-2.6.2.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/web.config">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/28/2021 22:26:25</publishTime>
     </File>
     <File Include="Web References/WebS/Reference.map">
       <publishTime>08/06/2021 22:57:28</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>12/24/2021 19:55:19</publishTime>
+      <publishTime>01/04/2022 14:06:50</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 87afe64..d975c2d 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -20,7 +20,9 @@
 	<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
 	<add key="FileIP" value="http://localhost:8080/"/>
 	  <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
-	  <add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> <!--棰滃彴寮忔満-->
+	  <!--<add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
+	  <add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx"/> <!--澶忓疂-->
+	 
 	  <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    鍗氭棩绉戞妧-->
     <add key="webpages:Version" value="3.0.0.0" />
     <add key="webpages:Enabled" value="false" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 6af1cc0..d152f2c 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
-    <NameOfLastUsedPublishProfile>D:\鏅轰簯MES\Lay-Api\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>false</UseIISExpress>
     <Use64BitIISExpress />
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index e7cc53b..897c588 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -54,6 +54,8 @@
             //return dal.GetList(sWhere);
         }
 
+       
+
         /// <summary>
         /// 鑾峰彇鐗╂枡鍒楄〃
         /// </summary>
@@ -4049,7 +4051,53 @@
             }
         }
         //鍒犻櫎鍗曟嵁涓存椂琛ㄤ俊鎭�
-        public bool DeleteBill(Int64 sHInterID,string HBillNo,string HBillType,string HBarCode, ref string sErrMsg)
+        public bool DeleteBill_AN(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType, ref string sErrMsg)
+        {
+            //DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
+            //if (dal.DeleteByInterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType))
+            //{
+            //    sErrMsg = "鍒犻櫎鎴愬姛锛�";
+            //    return true;
+            //}
+            //else
+            //{
+            //    sErrMsg = "鍒犻櫎澶辫触锛�";
+            //    return false;
+            //}
+            WebS.WebService1 oWebs = new WebS.WebService1();
+
+            if (oWebs.set_DelPonderationBillMain_Temp_InterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType, ref DBUtility.ClsPub.sErrInfo))
+            {
+                sErrMsg = "鍒犻櫎鎴愬姛锛�";
+                return true;
+            }
+            else
+            {
+                sErrMsg = "鍒犻櫎澶辫触锛�";
+                return false;
+            }
+
+            //if (WebSoBar == null)
+            //{
+            //    objJsonResult.code = "0";
+            //    objJsonResult.count = 0;
+            //    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+            //    objJsonResult.data = null;
+            //    return objJsonResult;
+            //}
+            //else
+            //{
+            //    objJsonResult.code = "0";
+            //    objJsonResult.count = 1;
+            //    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+            //    objJsonResult.data = WebSoBar;
+            //    return objJsonResult;
+            //}
+
+        }
+
+        //鍒犻櫎鍗曟嵁涓存椂琛ㄤ俊鎭�
+        public bool DeleteBill(Int64 sHInterID, string HBillNo, string HBillType, string HBarCode, ref string sErrMsg)
         {
             DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
             if (dal.DeleteBill(sHInterID, HBillNo, HBillType, HBarCode))

--
Gitblit v1.9.1