From 7b6a3fab34e4867f011246248ae66b4d75a6eb72 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 01 六月 2023 20:49:58 +0800
Subject: [PATCH] 1.生产开包工末道工序传入入库条码 2.App工序检验提交接口修改 3.基本资料增加ERP接口:车间部门、仓库查询、用户信息 4.PC端报工、收料、工序检验提交接口增加入库条码字段 5.系统设置新增:条码规则生成(固定条码)接口 6.DapperHelper增加方法 7.增加App图标图片

---
 VueWebApi/Controllers/AppPurchManagementController.cs |   45 ++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/VueWebApi/Controllers/AppPurchManagementController.cs b/VueWebApi/Controllers/AppPurchManagementController.cs
index fdf6d6a..6ca2b8a 100644
--- a/VueWebApi/Controllers/AppPurchManagementController.cs
+++ b/VueWebApi/Controllers/AppPurchManagementController.cs
@@ -71,15 +71,14 @@
         /// 閲囪喘鍒拌揣锛氭彁浜�
         /// </summary>
         /// <param name="purordercode">閲囪喘璁㈠崟鍙�</param>
-        /// <param name="orderstaus">鍗曟嵁鐘舵��:BINARIVE(閮ㄥ垎鍒拌揣)銆両NARIVE(宸插埌璐�)</param>
         /// <param name="username">鎿嶄綔浜哄憳</param>
         /// <param name="json">鍒拌揣鐗╂枡淇℃伅</param>
         /// <returns></returns>
         [Route(template: "MesAppPurchOrderSave")]
         [HttpPost]
-        public HttpResponseMessage MesAppPurchOrderSave(string purordercode,string orderstaus,string username, List<AppPurchOrderSave> json)
+        public HttpResponseMessage MesAppPurchOrderSave(string purordercode,string username, List<AppPurchOrderSave> json)
         {
-            mes = AppPurchManagementBLL.MesAppPurchOrderSave(purordercode,orderstaus, username, json);
+            mes = AppPurchManagementBLL.MesAppPurchOrderSave(purordercode, username, json);
             return TJson.toJson(mes);
         }
         #endregion
@@ -89,12 +88,13 @@
         /// <summary>
         /// 閲囪喘鍏ュ簱閫夋嫨鏈夊埌璐ч噰璐鍗�
         /// </summary>
+        /// <param name="purchordercode">閲囪喘璁㈠崟鍙�</param>
         /// <returns></returns>
         [Route(template: "MesAppPurchInStorSelectCGOrder")]
         [HttpGet]
-        public HttpResponseMessage MesAppPurchInStorSelectCGOrder()
+        public HttpResponseMessage MesAppPurchInStorSelectCGOrder(string purchordercode = null)
         {
-            mes = AppPurchManagementBLL.MesAppPurchInStorSelectCGOrder();
+            mes = AppPurchManagementBLL.MesAppPurchInStorSelectCGOrder(purchordercode);
             return TJson.toJson(mes);
         }
         #endregion
@@ -177,5 +177,40 @@
             return TJson.toJson(mes);
         }
         #endregion
+
+        #region[閲囪喘閫�璐у崟锛氭壂鎻忔爣绛綸
+        /// <summary>
+        /// 閲囪喘閫�璐у崟锛氭壂鎻忔爣绛�
+        /// </summary>
+        /// <param name="ordercode">閲囪喘璁㈠崟鍙�</param>
+        /// <param name="partcode">鐗╂枡缂栫爜</param>
+        /// <param name="labcode">鏍囩鏉$爜</param>
+        /// <returns></returns>
+        [Route(template: "MesAppPurchReturnInStorScanLabCode")]
+        [HttpGet]
+        public HttpResponseMessage MesAppPurchReturnInStorScanLabCode(string ordercode,string partcode,string labcode)
+        {
+            mes = AppPurchManagementBLL.MesAppPurchReturnInStorScanLabCode(ordercode,partcode,labcode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[閲囪喘閫�璐у崟锛氭彁浜
+        /// <summary>
+        /// 閲囪喘閫�璐у崟锛氭彁浜�
+        /// </summary>
+        /// <param name="orderid">閲囪喘璁㈠崟鍙穒d</param>
+        /// <param name="ordercode">閲囪喘璁㈠崟鍙�</param>
+        /// <param name="username">鎿嶄綔浜哄憳</param>
+        /// <param name="incontent">鎻愪氦鏁版嵁</param>
+        /// <returns></returns>
+        [Route(template: "MesAppPurchReturnInStorSave")]
+        [HttpGet]
+        public HttpResponseMessage MesAppPurchReturnInStorSave(string orderid, string ordercode, string username, string incontent)
+        {
+            mes = AppPurchManagementBLL.MesAppPurchReturnInStorSave(orderid,ordercode, username, incontent);
+            return TJson.toJson(mes);
+        }
+        #endregion
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3