From e38242f0209423a24d3f41b175954f8201721d0d Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 24 十月 2024 17:38:46 +0800
Subject: [PATCH] 1.同步通易T8基础资料 2.回写通易T8入库单

---
 VueWebCoreApi/Controllers/WorkOrderController.cs |   74 ++++++++++++++++++++++++++++++++++++
 1 files changed, 73 insertions(+), 1 deletions(-)

diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index 56173f8..0e3fc37 100644
--- a/VueWebCoreApi/Controllers/WorkOrderController.cs
+++ b/VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -9,6 +9,7 @@
 using VueWebCoreApi.DLL.BLL;
 using VueWebCoreApi.Models;
 using VueWebCoreApi.Models.ErpOrder;
+using VueWebCoreApi.Models.InventoryModel;
 using VueWebCoreApi.Models.ReportVerify;
 using VueWebCoreApi.Models.UpdateReport;
 using VueWebCoreApi.Models.WorkData;
@@ -82,6 +83,7 @@
             string erpordercode = obj["erpordercode"].ToString(); //璁㈠崟缂栧彿
             string saleordercode = obj["saleordercode"].ToString(); //閿�鍞鍗曞彿
             string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
+            string deptcode = obj["deptcode"].ToString(); //閮ㄩ棬缂栫爜
             string wkshopcode = obj["wkshopcode"].ToString(); //杞﹂棿缂栫爜
             string warehousecode = obj["warehousecode"].ToString(); //浠撳簱缂栫爜
             string erpqty = obj["erpqty"].ToString(); //璁㈠崟鏁伴噺
@@ -92,7 +94,7 @@
             string paystartdate = obj["paystartdate"].ToString(); //棰勮寮�宸ユ棩鏈�
             string payenddate = obj["payenddate"].ToString(); //棰勮瀹屽伐鏃ユ湡
             string clerkuser = obj["clerkuser"].ToString(); //閿�鍞鍗曚笟鍔″憳
-            mes = WorkOrderBLL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, paystartdate, payenddate, clerkuser, us);
+            mes = WorkOrderBLL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, deptcode,wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, paystartdate, payenddate, clerkuser, us);
             return Json(mes);
         }
         #endregion
@@ -778,5 +780,75 @@
             return Json(mes);
         }
         #endregion
+
+
+        #region[鐢熶骇鍏ュ簱鏉＄爜琛ユ墦]
+        /// <summary>
+        /// 鐢熶骇鍏ュ簱鏉＄爜琛ユ墦
+        /// </summary>
+        /// <param name="ordercode">宸ュ崟缂栧彿</param>
+        /// <returns></returns>
+        [Route(template: "ProductInHouseLabCode")]
+        [HttpGet]
+        public JsonResult ProductInHouseLabCode(string ordercode)
+        {
+            mes = WorkOrderBLL.ProductInHouseLabCode(ordercode);
+            return Json(mes);
+        }
+        #endregion
+
+        #region[鐢熶骇鍏ュ簱淇℃伅鏌ヨ]
+        /// <summary>
+        /// 鐢熶骇鍏ュ簱淇℃伅鏌ヨ
+        /// </summary>
+        /// <param name="saleordercode">閿�鍞崟鍙�</param>
+        /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+        /// <param name="erpordercode">璁㈠崟缂栧彿</param>
+        /// <param name="mesordercode">宸ュ崟缂栧彿</param>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="partname">浜у搧鍚嶇О</param>
+        /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+        /// <returns></returns>
+        [Route(template: "ProductInHouseOrderSearch")]
+        [HttpGet]
+        public JsonResult ProductInHouseOrderSearch(string saleordercode, string wkshopcode, string erpordercode = null, string mesordercode = null, string partcode = null, string partname = null, string partspec = null)
+        {
+            mes = WorkOrderBLL.ProductInHouseOrderSearch(saleordercode,wkshopcode, erpordercode, mesordercode, partcode, partname, partspec);
+            return Json(mes);
+        }
+        #endregion
+
+        #region[鐢熶骇鍏ュ簱鑾峰彇鍗曟嵁鍙穄
+        /// <summary>
+        /// 鐢熶骇鍏ュ簱鑾峰彇鍗曟嵁鍙�
+        /// </summary>
+        /// <param name="rightcode">鍔熻兘缂栫爜</param>
+        /// <returns></returns>
+        [Route(template: "ProductInHouseOrderCodeSearch")]
+        [HttpPost]
+        public JsonResult ProductInHouseOrderCodeSearch(string rightcode)
+        {
+            mes = WorkOrderBLL.ProductInHouseOrderCodeSearch(rightcode);
+            return Json(mes);
+        }
+        #endregion
+
+        #region[閫氭槗T8鐢熶骇鍏ュ簱鎻愪氦]
+        /// <summary>
+        /// 閫氭槗T8鐢熶骇鍏ュ簱鎻愪氦
+        /// </summary>
+        /// <param name="data">鎻愪氦鏁版嵁</param>
+        /// <returns></returns>
+        [Route(template: "ProductInHouseOrderSeave")]
+        [HttpPost]
+        public JsonResult ProductInHouseOrderSeave(InReptModel data)
+        {
+            var token = HttpContext.Request.Headers["Token"].ToString();
+            //var token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyY29kZSI6Ijk5OTkiLCJ1c2VybmFtZSI6Iuezu-e7n-euoeeQhuWRmCIsInN0b3JnX2NvZGUiOiIiLCJzdG9yZ19uYW1lIjoiIiwiaXNfc3lzdGVtX2FkbWluIjoiWSIsInJvbGVfY29kZSI6IiIsInJvbGVfZGF0YXBlcm1pc3Npb25zIjoiIiwidXNlcnR5cGUiOiJQQyIsInJlZGlza2V5IjoiTmV3TUVTTG9naW5Vc2VySURQQzk5OTkiLCJtZXNTZXR0aW5nIjoie1wicm91dGVcIjp0cnVlLFwiaXNPcmRlclwiOnRydWUsXCJkZXZpY2VcIjp0cnVlLFwidGVjaFwiOnRydWUsXCJ3b3JrT3JkZXJcIjp0cnVlLFwiZXZlcnlcIjpmYWxzZSxcImxhc3RcIjpmYWxzZX0iLCJ0aW1lb3V0IjoiMjAyNC0xMC0yNFQxMjozNTo1MC4zNDI1NzE2KzA4OjAwIn0.Nbc-1sXd4QLLsnj8wH9XC7iWEmP0wDG82gwLxIh94e4";
+            User us = JwtTools.Denocode(token.ToString());
+            mes = WorkOrderBLL.ProductInHouseOrderSeave(data, us);
+            return Json(mes);
+        }
+        #endregion
     }
 }

--
Gitblit v1.9.3