From 6b5da52c0700421211350f3b639dc9cb31350e68 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 27 五月 2022 08:53:20 +0800
Subject: [PATCH] 生产计划平台完善

---
 WebAPI/Controllers/Sc_PckSplitBillController.cs |  126 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 123 insertions(+), 3 deletions(-)

diff --git a/WebAPI/Controllers/Sc_PckSplitBillController.cs b/WebAPI/Controllers/Sc_PckSplitBillController.cs
index 59eea65..57ec188 100644
--- a/WebAPI/Controllers/Sc_PckSplitBillController.cs
+++ b/WebAPI/Controllers/Sc_PckSplitBillController.cs
@@ -60,9 +60,89 @@
 
         }
 
+        /// <summary>
+        /// 瑁呯鍗曟壂鎻忔墭鏉$爜/鐩存帴璋冪敤webservice
+        /// </summary>
+        /// <returns></returns>
+        [Route("PackUnionBill/SetPackBarCode_Webs1")]
+        [HttpGet]
+        public Object SetPackBarCode_Webs1(Int64 sInterID, string sBillNo, string sBillType, string HTBarCode, string sMaker, Int64 HOWNERID)
+        {
+            try
+            {
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+                //string sExpressNumber = "";
+                WebSoBar = oWebs.get_CheckTypeByPackBarCode_Pack(sInterID, sBillNo, sBillType, HTBarCode, sMaker, 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;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = e.Message + ";" + e.StackTrace;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
+        }
+
         [Route("PackSplitBill/GetBillEntry_TmpList_Pack")]
         [HttpGet]
         public object GetBillEntry_TmpList_Pack(Int64 HBillID, string HBillNo, string HBillType)
+        {
+            try
+            {
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                ds = oWebs.GetBillEntry_TmpList_Pack(HBillID, HBillNo, HBillType, 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 = ds.Tables[0];
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        [Route("PackUnionBill/GetBillEntry_TmpList_Pack1")]
+        [HttpGet]
+        public object GetBillEntry_TmpList_Pack1(Int64 HBillID, string HBillNo, string HBillType)
         {
             try
             {
@@ -111,6 +191,46 @@
             {
                 WebS.WebService1 oWebs = new WebS.WebService1();
                 if (oWebs.get_CheckTypeByBarCode_PackSplit(HBarCode, sInterID, HBillType, sBillNo, HTBarCode, sMaker, HOWNERID, ref DBUtility.ClsPub.sErrInfo))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鎵爜鎴愬姛锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = e.Message + ";" + e.StackTrace;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
+        }
+
+
+        /// <summary>
+        /// 鎷嗙鍗曟壂鎻忔媶绠辨潯鐮�/鐩存帴璋冪敤webservice
+        /// </summary>
+        /// <returns></returns>
+        [Route("PackUnionBill/get_CheckTypeByBarCode_Json1")]
+        [HttpGet]
+        public Object get_CheckTypeByBarCode_Json1(string HBarCode, Int64 sInterID, string HBillType, string sBillNo, string HTBarCode, string sMaker, Int64 HOWNERID)
+        {
+            try
+            {
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                if (oWebs.get_CheckTypeByBarCode_PackUnion(HBarCode, sInterID, HBillType, sBillNo, HTBarCode, sMaker, HOWNERID, ref DBUtility.ClsPub.sErrInfo))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 1;
@@ -197,8 +317,8 @@
         /// </summary>
         /// <returns></returns>
         [Route("PackSplit/set_SavePackSplitBill_Json")]
-        [HttpPost]
-        public Object set_SavePackSplitBill_Json(long sInterID, string HBillType, string sBillNo,string HTBarCode,string sMaker,long HOWNERID, ref string sErrMsg)
+        [HttpGet]
+        public Object set_SavePackSplitBill_Json(long sInterID, string HBillType, string sBillNo,string HTBarCode,string sMaker,long HOWNERID)
         {
             try
             {
@@ -207,7 +327,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 1;
-                    objJsonResult.Message = "鐢熸垚閫�鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細";
+                    objJsonResult.Message = "鐢熸垚鎴愬姛锛佸崟鎹彿涓猴細";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }

--
Gitblit v1.9.1