From db054d938d008ea7f968eef47120b806bb476f98 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 18 十月 2022 14:25:57 +0800
Subject: [PATCH] 功能维护

---
 WebAPI/Controllers/MoveStockBillController.cs |  625 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 329 insertions(+), 296 deletions(-)

diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index 23ad48e..1e612ef 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -208,7 +208,7 @@
         //}
 
         /// <summary>
-        /// 璋冩嫧鍗�/鎵潯鐮�
+        /// 璋冩嫧鍗�/鎵潯鐮�         锛�20220618澶囦唤鑰佹柟娉曪級
         /// </summary>
         /// <param name="sCode"></param>
         /// <param name="sInterID"></param>
@@ -221,311 +221,344 @@
         /// <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,string HSourceBillNo,string HSourceBillType)
+        //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 != "鎵樼洏鏉$爜")
+        //        {
+        //            if (HSourceBillNo == null)
+        //            {
+        //                HSourceBillNo = "";
+        //            }
+        //            return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker, HOrgID, HSourceBillNo, HSourceBillType);
+        //        }
+        //        else
+        //        {
+        //            //濡傛灉鏄泤鐞鍒欐墭鐩樻潯鐮佸垎瑙e苟妯℃嫙鎵爜
+
+        //            //鍒嗚В鎵樻潯鐮佸緱鍒版槑缁嗘潯鐮佷俊鎭啓鍏ュ嚭鍏ュ簱鏉$爜涓存椂琛�
+        //            DataSet dsTBarCode;
+        //            string sBarCode_MX;
+        //            dsTBarCode = oCn.RunProcReturn("select b.HBarCode HBarCodeMX from Sc_PackUnionBillMain a  " +
+        //            " inner join Sc_PackUnionBillSub b on a.HInterID = b.HInterID " +
+        //            " Where a.HBarCode_Pack = '" + sCode + "'", "Sc_PackUnionBillMain");
+        //            if (dsTBarCode == null || dsTBarCode.Tables[0].Rows.Count == 0)
+        //            {
+        //                //sErrMsg = "娌℃湁鎵惧埌鎵樼洏鏉$爜锛�";
+        //                objJsonResult.code = "0";
+        //                objJsonResult.count = 0;
+        //                objJsonResult.Message = "鎵爜澶辫触锛佹病鏈夋壘鍒版墭鐩樻潯鐮侊紒";
+        //                objJsonResult.data = null;
+        //                return objJsonResult;
+        //            }
+        //            else
+        //            {
+        //                for (int i = 0; i < dsTBarCode.Tables[0].Rows.Count; i++)
+        //                {
+        //                    //sBarCode_MX = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCodeMX"]);
+        //                    sCode = 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,HSourceBillNo,HSourceBillType);
+        //                    objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker, HOrgID, HSourceBillNo, HSourceBillType);
+        //                    if (objJsonResult.code == "0")
+        //                    {
+        //                        return objJsonResult;
+        //                    }
+        //                }
+        //                return objJsonResult;
+        //            }
+        //        }
+
+        //    }
+        //    catch (Exception e)
+        //    {
+        //        objJsonResult.code = "0";
+        //        objJsonResult.count = 0;
+        //        objJsonResult.Message = "鎵爜澶辫触锛�" + DBUtility.ClsPub.isStrNull(e);
+        //        objJsonResult.data = null;
+        //        return objJsonResult;
+        //    }
+        //}
+
+        //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
+        //    {
+        //        WebS.ClsKF_PonderationBillMain_Temp model = new WebS.ClsKF_PonderationBillMain_Temp();
+        //        string sErrMsg = "";
+        //        bool sBool = false;
+        //        double sRelQty = 0;
+        //        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";
+        //            objJsonResult.count = 0;
+        //            objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛�" + DBUtility.ClsPub.sErrInfo;
+        //            objJsonResult.data = null;
+        //            return objJsonResult;
+        //        }
+        //        else { 
+        //        if (HSourceBillNo.Trim() != "")
+        //        {
+        //            if (sBool == false)
+        //            {
+        //                objJsonResult.code = "0";
+        //                objJsonResult.count = 0;
+        //                objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "璇ョ墿鏂欏苟涓嶅瓨鍦ㄤ簬姝よ皟鎷ㄥ崟,璇风‘璁ょ墿鏂欐棤璇悗閲嶆柊鎵弿锛�";
+        //                objJsonResult.data = null;
+        //                return objJsonResult;
+        //            }
+        //        }
+        //        if (oView.HBarCodeType != "鎵樼洏鏉$爜")
+        //        {
+        //            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, oView.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;
+        //            }
+        //        }
+        //     }
+
+        //        model.HInterID = DBUtility.ClsPub.isLong(sInterID);
+        //        model.HBillNo = DBUtility.ClsPub.isStrNull(sBillNo);
+        //        model.HBillType = this.HBillType;
+        //        model.HMaker = HMaker;
+        //        //
+        //        model.HMaterID = oView.HMaterID;
+        //        model.HAuxPropID = oView.HAuxPropID;
+        //        model.HErpClsID = oView.HErpClsID;
+        //        model.HQty = oView.HQty;
+        //        model.HQtyMust = oView.HinitQty;
+        //        model.HBarCode = oView.HBarCode;
+        //        model.HBatchNo = oView.HBatchNo;
+        //        model.HMTONo = oView.HMTONo;
+
+        //        model.HWhID = DBUtility.ClsPub.isLong(HWHID);
+        //        model.HStockPlaceID = DBUtility.ClsPub.isLong(HSPID);
+        //        model.HSCWHID = SCWhID;
+        //        model.HOutStockPlaceID = SCSPID;
+        //        //model.HVDAPack = txtHVDAPack2.Text.Trim();
+        //        //model.HVDAMaterNum = txtHVDAMaterID.Text.Trim();
+        //        //model.HVDAQty = DBUtility.ClsPub.ObjToDouble(txtHVDAQty.Text.Trim());
+        //        //
+        //        model.HSourceInterID = oView.HSourceInterID;
+        //        model.HSourceEntryID = oView.HSourceEntryID;
+        //        model.HSourceBillNo = oView.HSourceBillNo;
+        //        model.HSourceBillType = oView.HSourceBillType;
+        //        model.HRedBlueFlag = false;
+        //        model.HPieceQty = 1;
+        //        model.HSTOCKORGID = HOrgID;
+        //        model.HOWNERID = HOrgID;
+        //        if(sBool)
+        //        {
+        //            model.HSourceBillType = HSourceBillType;
+        //        }
+        //        if(oWebs1.Get_CheckWhAndSP_BeUpdate(SCWhID,SCSPID,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;
+        //        }
+        //        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)
+        //    {
+
+        //        throw;
+        //    }
+        //}
+
+
+        public Object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 HSCWhID,Int64 HSCSPID,Double sQty, bool SourceFlag, string sSourceBillNo, string sHSourceBillType,Int64 HStockInOrgID,Int64 HStockOutOrgID,string HScanStyle)
         {
-            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 != "鎵樼洏鏉$爜")
-                {
-                    if (HSourceBillNo == null)
-                    {
-                        HSourceBillNo = "";
-                    }
-                    return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker, HOrgID, HSourceBillNo, HSourceBillType);
-                }
-                else
-                {
-                    //濡傛灉鏄泤鐞鍒欐墭鐩樻潯鐮佸垎瑙e苟妯℃嫙鎵爜
-
-                    //鍒嗚В鎵樻潯鐮佸緱鍒版槑缁嗘潯鐮佷俊鎭啓鍏ュ嚭鍏ュ簱鏉$爜涓存椂琛�
-                    DataSet dsTBarCode;
-                    string sBarCode_MX;
-                    dsTBarCode = oCn.RunProcReturn("select b.HBarCode HBarCodeMX from Sc_PackUnionBillMain a  " +
-                    " inner join Sc_PackUnionBillSub b on a.HInterID = b.HInterID " +
-                    " Where a.HBarCode_Pack = '" + sCode + "'", "Sc_PackUnionBillMain");
-                    if (dsTBarCode == null || dsTBarCode.Tables[0].Rows.Count == 0)
-                    {
-                        //sErrMsg = "娌℃湁鎵惧埌鎵樼洏鏉$爜锛�";
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "鎵爜澶辫触锛佹病鏈夋壘鍒版墭鐩樻潯鐮侊紒";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    else
-                    {
-                        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,HSourceBillNo,HSourceBillType);
-                            if (objJsonResult.code == "0")
-                            {
-                                return objJsonResult;
-                            }
-                        }
-                        return objJsonResult;
-                    }
-                }
-
-            }
-            catch (Exception e)
+            //if (sRedBlue == true)
+            //{
+            //    HBillType = "1245";
+            //}
+            //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+            WebS.WebService1 oWebs = new WebS.WebService1();
+            WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+            string sExpressNumber = "";
+            //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+            WebSoBar = oWebs.get_BarCode_MoveStock(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, HSCWhID, HSCSPID, sQty, SourceFlag, sSourceBillNo, sHSourceBillType, HStockInOrgID,HStockOutOrgID,HScanStyle, ref DBUtility.ClsPub.sErrInfo);
+            if (WebSoBar == null)
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "鎵爜澶辫触锛�" + DBUtility.ClsPub.isStrNull(e);
+                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                 objJsonResult.data = null;
                 return objJsonResult;
             }
-        }
-
-        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
+            else
             {
-                WebS.ClsKF_PonderationBillMain_Temp model = new WebS.ClsKF_PonderationBillMain_Temp();
-                string sErrMsg = "";
-                bool sBool = false;
-                double sRelQty = 0;
-                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";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛�" + DBUtility.ClsPub.sErrInfo;
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                else { 
-                if (HSourceBillNo.Trim() != "")
-                {
-                    if (sBool == false)
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "璇ョ墿鏂欏苟涓嶅瓨鍦ㄤ簬姝よ皟鎷ㄥ崟,璇风‘璁ょ墿鏂欐棤璇悗閲嶆柊鎵弿锛�";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                }
-                if (oView.HBarCodeType != "鎵樼洏鏉$爜")
-                {
-                    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;
-                    }
-                }
-             }
-
-                model.HInterID = DBUtility.ClsPub.isLong(sInterID);
-                model.HBillNo = DBUtility.ClsPub.isStrNull(sBillNo);
-                model.HBillType = this.HBillType;
-                model.HMaker = HMaker;
-                //
-                model.HMaterID = oView.HMaterID;
-                model.HAuxPropID = oView.HAuxPropID;
-                model.HErpClsID = oView.HErpClsID;
-                model.HQty = oView.HQty;
-                model.HQtyMust = oView.HinitQty;
-                model.HBarCode = oView.HBarCode;
-                model.HBatchNo = oView.HBatchNo;
-                model.HMTONo = oView.HMTONo;
-
-                model.HWhID = DBUtility.ClsPub.isLong(HWHID);
-                model.HStockPlaceID = DBUtility.ClsPub.isLong(HSPID);
-                model.HSCWHID = SCWhID;
-                model.HOutStockPlaceID = SCSPID;
-                //model.HVDAPack = txtHVDAPack2.Text.Trim();
-                //model.HVDAMaterNum = txtHVDAMaterID.Text.Trim();
-                //model.HVDAQty = DBUtility.ClsPub.ObjToDouble(txtHVDAQty.Text.Trim());
-                //
-                model.HSourceInterID = oView.HSourceInterID;
-                model.HSourceEntryID = oView.HSourceEntryID;
-                model.HSourceBillNo = oView.HSourceBillNo;
-                model.HSourceBillType = oView.HSourceBillType;
-                model.HRedBlueFlag = false;
-                model.HPieceQty = 1;
-                model.HSTOCKORGID = HOrgID;
-                model.HOWNERID = HOrgID;
-                if(sBool)
-                {
-                    model.HSourceBillType = HSourceBillType;
-                }
-                if(oWebs1.Get_CheckWhAndSP_BeUpdate(SCWhID,SCSPID,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;
-                }
-                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;
+                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+                objJsonResult.data = WebSoBar;
                 return objJsonResult;
-            }
-            catch (Exception)
-            {
-
-                throw;
             }
         }
 
@@ -585,7 +618,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 1;
-                    objJsonResult.Message = "鐢熸垚璋冩嫧鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                     objJsonResult.data = null;
                     return objJsonResult;
                 }

--
Gitblit v1.9.1