From cbeb997178132c5c71d57b5011847f7d6e21930a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 08 十一月 2024 15:58:55 +0800
Subject: [PATCH] 1.入库记录删除 2.畅捷通T+反写产成品入库单(直接写表) 3.erp同步基础资料和订单改为根据配置取T+或者T8 4.通用基础资料仓库资料放出erpid 5.生产入库查询信息接口调整字段(T+和T8共用)
---
VueWebCoreApi/Controllers/WorkOrderController.cs | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index 0e3fc37..feb5ecf 100644
--- a/VueWebCoreApi/Controllers/WorkOrderController.cs
+++ b/VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -833,9 +833,23 @@
}
#endregion
- #region[閫氭槗T8鐢熶骇鍏ュ簱鎻愪氦]
+ #region[鐢熶骇鍏ュ簱鑾峰彇閮ㄩ棬淇℃伅]
/// <summary>
- /// 閫氭槗T8鐢熶骇鍏ュ簱鎻愪氦
+ /// 鐢熶骇鍏ュ簱鑾峰彇閮ㄩ棬淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "DeptSelectData")]
+ [HttpGet]
+ public JsonResult DeptSelectData()
+ {
+ mes = WorkOrderBLL.DeptSelectData();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[閫氭槗T8鐢熶骇鍏ュ簱鎻愪氦-浠ｇ爜鐗圿
+ /// <summary>
+ /// 閫氭槗T8鐢熶骇鍏ュ簱鎻愪氦-浠ｇ爜鐗�
/// </summary>
/// <param name="data">鎻愪氦鏁版嵁</param>
/// <returns></returns>
@@ -850,5 +864,40 @@
return Json(mes);
}
#endregion
+
+ #region[閫氭槗T8鐢熶骇鍏ュ簱鎻愪氦-瀛樺偍杩囩▼鐗�(閫傜敤鍚屼竴鍙版湇鍔″櫒锛屽悓涓�涓暟鎹簱)]
+ /// <summary>
+ /// 閫氭槗T8鐢熶骇鍏ュ簱鎻愪氦-瀛樺偍杩囩▼鐗�(閫傜敤鍚屼竴鍙版湇鍔″櫒锛屽悓涓�涓暟鎹簱)
+ /// </summary>
+ /// <param name="data">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "ProductInHouseOrderSpSeave")]
+ [HttpPost]
+ public JsonResult ProductInHouseOrderSpSeave(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.ProductInHouseOrderSpSeave(data, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鐣呮嵎閫歍+鐢熶骇鍏ュ簱鎻愪氦-瀛樺偍杩囩▼鐗�(閫傜敤鍚屼竴鍙版湇鍔″櫒锛屽悓涓�涓暟鎹簱)]
+ /// <summary>
+ /// 鐣呮嵎閫歍+鐢熶骇鍏ュ簱鎻愪氦-瀛樺偍杩囩▼鐗�(閫傜敤鍚屼竴鍙版湇鍔″櫒锛屽悓涓�涓暟鎹簱)
+ /// </summary>
+ /// <param name="data">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "TProductInHouseOrderSpSeave")]
+ [HttpPost]
+ public JsonResult TProductInHouseOrderSpSeave(InReptModel data)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.TProductInHouseOrderSpSeave(data, us);
+ return Json(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3