From a8e5d1b20e9ac0a95f84584830e3248a55df4dba Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 15 十一月 2023 20:15:25 +0800
Subject: [PATCH] 生产订单变更单保存时进行保存后检验报错信息改为:存在关联单据,请查看是否存在下游生产订单或销售出库单!

---
 WebAPI/Controllers/ProductInController.cs | 1127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 1,102 insertions(+), 25 deletions(-)

diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 13a7233..d7b2890 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -59,6 +59,37 @@
                 return "";
             }
         }
+
+        /// <summary>
+        /// 浜у搧鍏ュ簱缂撳瓨鍒楄〃缂栬緫鍓嶅垽鏂崟鎹槸鍚﹀凡涓婁紶  鐩存帴璋僕ebService
+        /// </summary>
+        /// <returns></returns>
+        //[Route("ProductIn/ProductInTempList_Modify")]
+        //[HttpGet]
+        //public Object ProductInTempList_Modify(Int64 sInterID,string sBillNo, string sBillType)
+        //{
+            
+        //    //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();
+        //    if (oWebs.TempList_Modify(sInterID, sBillNo, sBillType, ref sErrMsg))
+        //    {
+        //        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 = null;
+        //        return objJsonResult;
+        //    }
+        //}
+
+
         /// <summary>
         /// 浜у搧鍏ュ簱/鎵潯鐮�/鐩存帴璋冪敤webservice
         /// </summary>
@@ -77,6 +108,295 @@
             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_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+            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;
+            }
+        }
+
+
+        //鍒锋柊琛ㄤ綋  杩斿洖鍑哄叆搴撴潯鐮佷复鏃惰〃锛堥鏂欏嚭搴撶畝娲佺増锛�
+        [Route("ProductIn/DisBillEntryList_Webs_New_Json1")]
+        [HttpGet]
+        public object DisBillEntryList_Webs_New_Json1(long HBillID, string HBillNo, string HBillType, string sMouldManagerCtl, string sFIFOCtl)
+        {
+            try
+            {
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                ds = oWebs.GetBillEntry_TmpList(HBillID, HBillNo, HBillType, ref sMouldManagerCtl, ref sFIFOCtl, ref DBUtility.ClsPub.sErrInfo);
+                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 = new
+                    {
+                        list = ds.Tables[0],
+                        list2 = ds.Tables[4]
+                    };
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        //缂撳瓨鍒楄〃鏌ヨ鍔熻兘
+        [Route("ProductInBillList/list1")]
+        [HttpGet]
+        public object list1(string BillType, string HBillNo, string HSourceBillNo)
+        {
+            try
+            {
+                if (HSourceBillNo == null)
+                {
+                    HSourceBillNo = "";
+                }
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                ds = oWebs.GetKf_ICStockBillQueryList(BillType, HBillNo, HSourceBillNo);
+                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>
+        /// 鍏朵粬鍑哄簱鏍¢獙鎵弿鍗曟嵁鍙�/鐩存帴璋冪敤webservice
+        /// </summary>
+        /// <returns></returns>
+        //[Route("OtherOutBill_Check_New/BillNo")]
+        [Route("ProductIn/BillNo")]
+        [HttpGet]
+        public Object BillNo(string HBillNo, string HBillType, string HMaker, Int64 HOwnerID)
+        {
+            //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_BillBarCode_OtherOutCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo);
+            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;
+            }
+        }
+
+        /// <summary>
+        /// 鐢熶骇棰嗘枡鏍¢獙鎵弿鍗曟嵁鍙�/鐩存帴璋冪敤webservice
+        /// </summary>
+        /// <returns></returns>
+        //[Route("OtherOutBill_Check_New/BillNo")]
+        [Route("MateBill/BillNo1")]
+        [HttpGet]
+        public Object BillNo1(string HBillNo, string HBillType, string HMaker, Int64 HOwnerID)
+        {
+            //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_BillBarCode_MateOutCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo);
+            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;
+            }
+        }
+
+        /// <summary>
+        /// 鐩存帴璋冩嫧鍗曟牎楠屾壂鎻忓崟鎹彿/鐩存帴璋冪敤webservice
+        /// </summary>
+        /// <returns></returns>
+        //[Route("OtherOutBill_Check_New/BillNo")]
+        [Route("MoveStockBill/BillNo2")]
+        [HttpGet]
+        public Object BillNo2(string HBillNo, string HBillType, string HMaker, Int64 HOwnerID)
+        {
+            //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_BillBarCode_MoveStockCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo);
+            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;
+            }
+        }
+
+        /// <summary>
+        /// 鍏朵粬鍑哄簱鏍¢獙鎵弿鏉$爜/鐩存帴璋冪敤webservice
+        /// </summary>
+        /// <returns></returns>
+        [Route("OtherOutBill_Check_New/get_InfoByBarCode_Source_Json")]
+        [HttpGet]
+        //public Object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string HBillType,string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 sQty, Int64 HOWNERID)
+        //{
+        //    WebS.WebService1 oWebs = new WebS.WebService1();
+        //    WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+        //    string sExpressNumber = "";
+
+        //    var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
+        //    //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_CheckTypeByBarCode_BillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker,  WhID,  SPID,  sQty,  HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+        //    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 object get_InfoByBarCode_Source_Json(string sCode, long sInterID, string HBillType, string sBillNo, string sMaker, long WhID, long SPID, long sQty, long HOWNERID)
+        {
+            WebS.WebService1 oWebs = new WebS.WebService1();
+            WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+            string sBarCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
+            string sExpressNumber = "";
+            WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sBarCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, (double)sQty, HOWNERID, ref ClsPub.sErrInfo);
+            bool flag = WebSoBar == null;
+            object result;
+            if (flag)
+            {
+                this.objJsonResult.code = "0";
+                this.objJsonResult.count = 0;
+                this.objJsonResult.Message = ClsPub.sErrInfo;
+                this.objJsonResult.data = null;
+                result = this.objJsonResult;
+            }
+            else
+            {
+                this.objJsonResult.code = "0";
+                this.objJsonResult.count = 1;
+                this.objJsonResult.Message = ClsPub.sErrInfo;
+                this.objJsonResult.data = WebSoBar;
+                result = this.objJsonResult;
+            }
+            return result;
+        }
+
+
+        /// <summary>
+        /// 鐩存帴璋冩嫧鏍¢獙鎵弿鏉$爜/鐩存帴璋冪敤webservice
+        /// </summary>
+        /// <returns></returns>
+        [Route("MoveStockBill_Check_New/get_InfoByBarCode_Source_Json1")]
+        [HttpGet]
+        public Object get_InfoByBarCode_Source_Json1(string sCode, Int64 sInterID, string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 SCWhID, Int64 SCSPID, Int64 sQty, Int64 HOWNERID)
+        {
+            WebS.WebService1 oWebs = new WebS.WebService1();
+            WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+            var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
+            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_MoveStockBillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, SCWhID, SCSPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
             if (WebSoBar == null)
             {
                 objJsonResult.code = "0";
@@ -165,6 +485,392 @@
             }
         }
 
+
+        /// <summary>
+        /// 鍏朵粬鍑哄簱鏍¢獙杩斿洖缃戞牸淇℃伅
+        /// </summary>
+        /// <returns></returns>
+        [Route("OtherOutBill_Check_New/DisBillEntryList_Webs_Json1")]
+        [HttpGet]
+        public object DisBillEntryList_Webs_Json1(long HBillID, string HBillType, string sWhere)
+        {
+            try
+            {
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                ds = oWebs.GetKf_PonderationBillMain_Temp_BillCheck(HBillID, HBillType, sWhere);
+                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>
+        /// <returns></returns>
+        [Route("OtherOutBill_Check_New/DisPonderationBillMain_TempList_BillCheck")]
+        [HttpGet]
+        public object DisPonderationBillMain_TempList_BillCheck(string HBillType, string sHMaker, Int64 HOrgID)
+        {
+            try
+            {
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                ds = oWebs.GetKf_PonderationBillMain_TempList_BillCheck(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>
+        /// <returns></returns>
+        [Route("OtherOutBill_Check_New/bj")]
+        [HttpGet]
+        public object bj(string HBillNo, string HBillType)
+        {
+            try
+            {
+                WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                WebSoBar = oWebs.GetSourceBillList_BillCheck(HBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo);
+                if (WebSoBar == null)
+                {
+
+                    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 = WebSoBar;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        ///// <summary>
+        ///// 浜у搧鍏ュ簱缂撳瓨鍒楄〃鍒锋柊淇℃伅
+        ///// </summary>
+        ///// <returns></returns>
+        //[Route("ProductIn/DisBillEntryList_Json1")]
+        //[HttpGet]
+        //public object DisBillEntryList_Json1(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>
+        /// <param name="HSourceBillNo"></param>
+        /// <returns></returns>
+        [Route("ProdIn/ProdInDetaiNew")]
+        [HttpGet]
+        public object ProdInDetaiNew(string HInterID)
+        {
+
+            DataSet ds;
+            List<object> list = new List<object>();
+            string Swhere = "";
+            try
+            {
+                if (HInterID != "" || HInterID != null)
+                {
+                    Swhere = " and hmainid='" + HInterID + "'";
+                }
+                else
+                {
+                    Swhere = HInterID;
+                }
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                //鑾峰彇閿�鍞嚭搴撶紪杈戞暟鎹�
+                string sql = "select  鏁伴噺 HQty,搴旀敹鏁伴噺 HQtyMust,鐗╂枡浠g爜 HMaterNumber,鐗╂枡鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterModel,婧愬崟涓诲唴鐮� HSourceInterID,婧愬崟瀛愬唴鐮� HSourceEntryID,婧愬崟鍗曞彿 HSourceBillNo,鎵规 HBatchNo,杈呭姪灞炴�� HAuxPropID,璁″垝璺熻釜鍙� HMTONo,ck HWHID  from h_v_SelloutDetail where 1 = 1 " + Swhere + "";
+                ds = oCN.RunProcReturn(sql, "h_v_SelloutDetail");
+
+                list.Add(ds.Tables[0]);
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+                objJsonResult.list = list;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+                objJsonResult.data = null;
+            }
+            return objJsonResult;
+        }
+
+
+        /// <summary>
+        /// 缂栬緫椤甸潰杩斿洖浜у搧鍏ュ簱鏉$爜涓存椂琛ㄤ俊鎭�
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetHBarCodeShowBillSub")]
+        [HttpGet]
+        public object GetHBarCodeShowBillSub(long HInterID, long HMaterID, Int64 HAuxPropID, string HMTONo, Int64 HWhID, Int64 HSPID, Int64 HSCWhID, Int64 HSCSPID, string HBatchNo, Int64 HSourceInterID, Int64 HSourceEntryID, string sBillType, string sWhere)
+        {
+            try
+            {
+
+                if (HMTONo == null)
+                {
+                    HMTONo = "";
+                }
+                if (HBatchNo == null)
+                {
+                    HBatchNo = "";
+                }
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                ds = oWebs.GetBarCode_Temp(HInterID, HMaterID, HAuxPropID, HMTONo, HWhID, HSPID, HSCWhID, HSCSPID, HBatchNo, HSourceInterID, HSourceEntryID, sBillType, sWhere);
+                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;
+            }
+        }
+
+
+
+        #region 鐐瑰嚮缂栬緫鎸夐挳杩斿洖鍙傛暟淇℃伅
+        /// <summary>
+        /// 鐐瑰嚮缂栬緫鎸夐挳杩斿洖鍙傛暟淇℃伅
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Kf_BarCodeEditDlg/Kf_BarCodeEditDlg_Json")]
+        [HttpGet]
+        public object Kf_BarCodeEditDlg_Json(string sWhere)
+        {
+            DataSet ds;
+            try
+            {
+
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+               
+                    string sql1 = "select * from KF_PonderationBillMain_Temp Where HQty<>0 ";
+                    string sql = sql1 + sWhere + " order by hinterid desc";
+                    ds = oCN.RunProcReturn(sql, "KF_PonderationBillMain_Temp");
+
+                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;
+            }
+        }
+
+        #endregion
+
+
+        //鐐瑰嚮缂栬緫  鍏敤绐椾綋鍒犻櫎鏂规硶
+        [Route("Kf_BarCodeEditDlg/DeltetBill")]
+        [HttpGet]
+        public object DeltetBill(long HInterID,string HBarCode,string HBillType)
+        {
+            string sErrMsg = string.Empty;
+            try
+            {
+                if (webserver.set_DelPonderationBillMain_Temp_BarCode(HInterID,HBarCode, HBillType, 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)
+            {
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
+        }
+
+
+        /// <summary>
+        /// 杩斿洖浜у搧鍏ュ簱鎵爜鏄庣粏  
+        /// </summary>
+        /// <returns></returns>
+        [Route("ProductIn/DisPlayBarCodeList_Json")]
+        [HttpGet]
+        public object DisPlayBarCodeList_Json(long HBillID, string HBillNo, string HBillType, string sMouldManagerCtl, string sFIFOCtl)
+        {
+            try
+            {
+                ds = webserver.GetBarcodeList(HBillID, HBillNo, HBillType, ref sMouldManagerCtl, ref sFIFOCtl, ref DBUtility.ClsPub.sErrInfo);
+                if (ds == null || ds.Tables[3].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;
+            }
+        }
+
         [Route("ProductIn/DisBillEntryList_Mate_Webs_Json")]
         [HttpGet]
         public object DisBillEntryList_Mate_Webs_Json(string HBillType, string sWhere)
@@ -219,7 +925,7 @@
                 {
                     ds = webserver.GetSc_ICMOBillList(sWhere + "  ");
                 }
-                if (HSourceBillType == "3711")
+                else if (HSourceBillType == "3711")
                 {
                     ds = webserver.GetSc_ICMOReportBillList(sWhere + "  ");
                 }
@@ -459,6 +1165,135 @@
         [HttpPost]
         public object set_SaveProductInBill_Json([FromBody]JObject oMain)
         {
+            //var _value = oMain["oMain"].ToString();
+            //string msg1 = _value.ToString();
+            ////List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
+            ////ListModels oListModels = new ListModels();
+            ////lsmain = oListModels.getProductInBillMainByJson(msg1);
+            ////lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+            ////lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+            ////string sSourceBillType = lsmain[0].HBillType;
+            ////BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
+            ////return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
+
+            //try
+            //{
+            //    List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
+            //    ListModels oListModels = new ListModels();
+            //    lsmain = oListModels.getProductInBillMainByJson(msg1);
+            //    //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+            //    //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+            //    string sSourceBillType = lsmain[0].HBillType;
+
+            //    WebAPI.WebS.ClsKf_ProductInBillMain websLsmain = new WebS.ClsKf_ProductInBillMain();
+
+            //    websLsmain.HInterID = lsmain[0].HInterID;
+            //    websLsmain.HDate = lsmain[0].HDate;
+            //    websLsmain.HBillNo = lsmain[0].HBillNo;
+            //    websLsmain.HDeptID = lsmain[0].HDeptID;
+            //    websLsmain.HEmpID = lsmain[0].HEmpID;
+            //    websLsmain.HKeeperID= lsmain[0].HKeeperID;
+            //    websLsmain.HRemark = lsmain[0].HRemark;
+            //    websLsmain.HMaker = lsmain[0].HMaker;
+            //    websLsmain.HWHID = lsmain[0].HWHID;
+            //    websLsmain.HSupID = lsmain[0].HSupID;
+            //    websLsmain.HExplanation = lsmain[0].HExplanation;
+            //    websLsmain.HBillType = "1202";//鍥哄畾鍊�
+
+
+            //    if (webserver.set_SaveProductInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
+            //    {
+            //        objJsonResult.code = "0";
+            //        objJsonResult.count = 1;
+            //        objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+            //        objJsonResult.data = null;
+            //        return objJsonResult;
+            //    }
+            //    else
+            //    {
+            //        objJsonResult.code = "0";
+            //        objJsonResult.count = 0;
+            //        objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+            //        objJsonResult.data = null;
+            //        return objJsonResult;
+            //    }
+            //}
+            //catch (Exception e)
+            //{
+            //    objJsonResult.code = "0";
+            //    objJsonResult.count = 0;
+            //    objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+            //    objJsonResult.data = null;
+            //    return objJsonResult;
+            //}
+
+
+
+
+
+            string text = oMain["oMain"].ToString();
+            string jsonString = text.ToString();
+            object result;
+            try
+            {
+                List<ClsKf_ProductInBillMain> list = new List<ClsKf_ProductInBillMain>();
+                ListModels listModels = new ListModels();
+                list = listModels.getProductInBillMainByJson(jsonString);
+                //list[0].HYear = ClsPub.isLong(DateTime.Now.Year);
+                //list[0].HDate = ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+                string hbillType = list[0].HBillType;
+                WebAPI.WebS.ClsKf_ProductInBillMain clsKf_ProductInBillMain = new WebAPI.WebS.ClsKf_ProductInBillMain();
+                clsKf_ProductInBillMain.HInterID = list[0].HInterID;
+                clsKf_ProductInBillMain.HDate = list[0].HDate;
+                clsKf_ProductInBillMain.HBillNo = list[0].HBillNo;
+                clsKf_ProductInBillMain.HDeptID = list[0].HDeptID;
+                clsKf_ProductInBillMain.HEmpID = list[0].HEmpID;
+                clsKf_ProductInBillMain.HKeeperID = list[0].HKeeperID;
+                clsKf_ProductInBillMain.HRemark = list[0].HRemark;
+                clsKf_ProductInBillMain.HMaker = list[0].HMaker;
+                clsKf_ProductInBillMain.HWHID = list[0].HWHID;
+                clsKf_ProductInBillMain.HSupID = list[0].HSupID;
+                clsKf_ProductInBillMain.HExplanation = list[0].HExplanation;
+                clsKf_ProductInBillMain.HBillType = "1202";
+                bool flag = this.webserver.set_SaveProductInBill_New(clsKf_ProductInBillMain, hbillType, ref ClsPub.sErrInfo);
+                if (flag)
+                {
+                    this.objJsonResult.code = "0";
+                    this.objJsonResult.count = 1;
+                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //鎴愬姛锛�
+                    //this.objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+                    this.objJsonResult.data = null;
+                    result = this.objJsonResult;
+                }
+                else
+                {
+                    this.objJsonResult.code = "0";
+                    this.objJsonResult.count = 0;
+                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //澶辫触锛�
+                    //this.objJsonResult.Message = "涓婁紶澶辫触锛�" + ClsPub.sErrInfo;
+                    this.objJsonResult.data = null;
+                    result = this.objJsonResult;
+                }
+            }
+            catch (Exception ex)
+            {
+                this.objJsonResult.code = "0";
+                this.objJsonResult.count = 0;
+                this.objJsonResult.Message = "涓婁紶澶辫触锛�" + ex.ToString();
+                this.objJsonResult.data = null;
+                result = this.objJsonResult;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 鍏朵粬鍑哄簱鏍¢獙
+        /// </summary>
+        /// <returns></returns>
+        [Route("OtherOutBill_Check_New/set_SaveOtherOutBill_Check_New_Json")]
+        [HttpPost]
+        public object set_SaveOtherOutBill_Check_New_Json([FromBody] JObject oMain)
+        {
             var _value = oMain["oMain"].ToString();
             string msg1 = _value.ToString();
             //List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
@@ -469,36 +1304,28 @@
             //string sSourceBillType = lsmain[0].HBillType;
             //BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
             //return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
-            
+
             try
             {
-                List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
+                List<Model.ClsKf_OtherOutBillMain> lsmain = new List<Model.ClsKf_OtherOutBillMain>();
                 ListModels oListModels = new ListModels();
-                lsmain = oListModels.getProductInBillMainByJson(msg1);
-                lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
-                lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
-                string sSourceBillType = lsmain[0].HBillType;
+                lsmain = oListModels.getOtherOutBillMainByJson(msg1);
+                //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+                //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+                //string sSourceBillType = lsmain[0].HBillType;
 
-                WebAPI.WebS.ClsKf_ProductInBillMain websLsmain = new WebS.ClsKf_ProductInBillMain();
+                WebAPI.WebS.ClsKf_OtherOutBillMain websLsmain = new WebS.ClsKf_OtherOutBillMain();
 
                 websLsmain.HInterID = lsmain[0].HInterID;
-                websLsmain.HDate = lsmain[0].HDate;
                 websLsmain.HBillNo = lsmain[0].HBillNo;
-                websLsmain.HDeptID = lsmain[0].HDeptID;
-                websLsmain.HEmpID = lsmain[0].HEmpID;
-                websLsmain.HKeeperID= lsmain[0].HKeeperID;
-                websLsmain.HRemark = lsmain[0].HRemark;
-                websLsmain.HMaker = lsmain[0].HMaker;
-                websLsmain.HWHID = lsmain[0].HWHID;
-                websLsmain.HSupID = lsmain[0].HSupID;
-                websLsmain.HExplanation = lsmain[0].HExplanation;
+                websLsmain.HBillType = "1206";
 
-
-                if (webserver.set_SaveProductInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                if (oWebs.set_SaveOtherOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 1;
-                    objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+                    objJsonResult.Message = "鍏朵粬鍑哄簱鍗曟牎楠屾垚鍔燂紒鍗曟嵁鍙蜂负锛�";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -521,14 +1348,141 @@
             }
         }
 
-        [Route("ProductIn/Delete_Json")]
+
+
+        /// <summary>
+        /// 鐢熶骇棰嗘枡鏍¢獙
+        /// </summary>
+        /// <returns></returns>
+        [Route("MateOutBill_Check_New/set_SaveMateOutBill_Check_New_Json")]
+        [HttpPost]
+        public object set_SaveMateOutBill_Check_New_Json([FromBody] JObject oMain)
+        {
+            var _value = oMain["oMain"].ToString();
+            string msg1 = _value.ToString();
+            //List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
+            //ListModels oListModels = new ListModels();
+            //lsmain = oListModels.getProductInBillMainByJson(msg1);
+            //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+            //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+            //string sSourceBillType = lsmain[0].HBillType;
+            //BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
+            //return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
+
+            try
+            {
+                List<Model.ClsKf_MateOutBillMain> lsmain = new List<Model.ClsKf_MateOutBillMain>();
+                ListModels oListModels = new ListModels();
+                lsmain = oListModels.getMateOutBillMainByJson(msg1);
+                //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+                //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+                //string sSourceBillType = lsmain[0].HBillType;
+
+                WebAPI.WebS.ClsKf_MateOutBillMain websLsmain = new WebS.ClsKf_MateOutBillMain();
+
+                websLsmain.HInterID = lsmain[0].HInterID;
+                websLsmain.HBillNo = lsmain[0].HBillNo;
+                websLsmain.HBillType = "1204";
+
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                if (oWebs.set_SaveMateOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鐢熶骇棰嗘枡鍗曟牎楠屾垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+
+        /// <summary>
+        /// 鐢熶骇璋冩嫧鏍¢獙
+        /// </summary>
+        /// <returns></returns>
+        [Route("MoveStockBill_Check_New/set_SaveMoveStockBill_Check_Json")]
+        [HttpPost]
+        public object set_SaveMoveStockBill_Check_Json([FromBody] JObject oMain)
+        {
+            var _value = oMain["oMain"].ToString();
+            string msg1 = _value.ToString();
+            //List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
+            //ListModels oListModels = new ListModels();
+            //lsmain = oListModels.getProductInBillMainByJson(msg1);
+            //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+            //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+            //string sSourceBillType = lsmain[0].HBillType;
+            //BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
+            //return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
+
+            try
+            {
+                List<Model.ClsKf_MoveStockBillMain> lsmain = new List<Model.ClsKf_MoveStockBillMain>();
+                ListModels oListModels = new ListModels();
+                lsmain = oListModels.getMoveStockBillMainByJson(msg1);
+                //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+                //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+                //string sSourceBillType = lsmain[0].HBillType;
+
+                WebAPI.WebS.ClsKf_MoveStockBillMain websLsmain = new WebS.ClsKf_MoveStockBillMain();
+
+                websLsmain.HInterID = lsmain[0].HInterID;
+                websLsmain.HBillNo = lsmain[0].HBillNo;
+                websLsmain.HBillType = "1207";
+
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                if (oWebs.set_SaveMoveStockBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鐩存帴璋冩嫧鍗曟牎楠屾垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+                    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_AN")]
         [HttpGet]
-        public object Delete_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)
+        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.set_DelPonderationBillMain_Temp_InterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType, ref sErrMsg))
+                if (webserver.DeleteBill_AN(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType, ref sErrMsg))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 1;
@@ -545,12 +1499,49 @@
                     return objJsonResult;
                 }
             }
-            catch (Exception)
+            catch (Exception e)
             {
 
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+                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)
+        {
+            string sErrMsg = string.Empty;
+            try
+            {
+                if (webserver.DeleteBill(HInterID, HBillNo, HBillType, HBarCode, 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;
             }
@@ -668,6 +1659,92 @@
         }
 
 
+        /// <summary>
+        /// 鏉$爜缂栬緫鐣岄潰 缂栬緫鎸夐挳鏂规硶
+        /// </summary>
+        /// <returns></returns>
+        [Route("Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill")]
+        [HttpGet]
+        public object GetCheckQtyByBarCodeBill(Int64 HInterID, string HBillType, string sBatchNo,string sBarCode,Int64 sSCWhID
+            ,Int64 sSCSPID, Int64 sAuxPropID,string sMTONo,double iQty,Int64 HMaterID
+            ,Int64 sWhID,Int64 sSPID,Int64 HSourceInterID,Int64 HSourceEntryID, double EndQty, double sQty)
+        {
+            try
+            {
+                if (sBatchNo == null)
+                {
+                    sBatchNo = "";
+                }
+                if (sMTONo == null)
+                {
+                    sMTONo = "";
+                }
+                if ( HBillType == "1204" || HBillType == "1205" || HBillType == "1206" || HBillType == "1211" || HBillType == "1213")
+                {
+                    WebS.WebService1 oWebs = new WebS.WebService1();
+                    if (webserver.Get_CheckQtyByBarCode(sBarCode, sWhID, sSPID, sAuxPropID, sBatchNo, sMTONo, iQty, ref sRelQty))
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "搴撳瓨瓒冲锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else if (sRelQty == 0)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鏃犲簱瀛橈紒";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        EndQty = sRelQty - sQty;
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "搴撳瓨涓嶈冻锛屽凡鑾峰彇瀹為檯搴撳瓨鏁伴噺锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                else if (HBillType == "1203" || HBillType == "1205" || HBillType == "1202")
+                {
+                    WebS.WebService1 oWebs = new WebS.WebService1();
+                 if (oWebs.set_SavePonderationBillMain_Temp_ChangGui(HInterID, HMaterID, sAuxPropID, sMTONo, sWhID, sSPID, sSCWhID, sSCSPID, sBatchNo, HSourceInterID, HSourceEntryID, sBarCode, HBillType, EndQty, ref DBUtility.ClsPub.sErrInfo))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "璋冩暣鎴愬姛";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "璋冩暣澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                }
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                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;
+            }
+        }
+
 
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1