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/AppProductionManagementController.cs |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/VueWebApi/Controllers/AppProductionManagementController.cs b/VueWebApi/Controllers/AppProductionManagementController.cs
index 4399430..618c9f7 100644
--- a/VueWebApi/Controllers/AppProductionManagementController.cs
+++ b/VueWebApi/Controllers/AppProductionManagementController.cs
@@ -13,7 +13,7 @@
 {
     [RoutePrefix(prefix: "api/AppProductionManagement")]
     [ControllerGroup("App鐢熶骇绠$悊", "鍦ㄧ嚎鎺ュ彛")]
-    [ChannelActionFilterAttributeApp]
+    //[ChannelActionFilterAttributeApp]
     public class AppProductionManagementController : ApiController
     {
         //瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -165,6 +165,7 @@
             string stepseq = HttpContext.Current.Request["stepseq"].ToString();//宸ュ簭搴忓彿
             string stepcode = HttpContext.Current.Request["stepcode"].ToString();//宸ュ簭缂栫爜
             string eqpcode = HttpContext.Current.Request["eqpcode"].ToString();//璁惧缂栫爜
+            string inbarcode = HttpContext.Current.Request["inbarcode"].ToString(); //鍏ュ簱鏉$爜
             string reckway = HttpContext.Current.Request["reckway"].ToString(); //璁′欢鏂瑰紡(鐝粍:group銆佷釜浜�:person)
             string usergroupcode = HttpContext.Current.Request["usergroupcode"].ToString();//鐝粍缂栫爜
             string reportuser = HttpContext.Current.Request["reportuser"].ToString();//鎶ュ伐浜哄憳
@@ -175,7 +176,7 @@
             string badcode = HttpContext.Current.Request["badcode"].ToString();//涓嶈壇鍘熷洜缂栫爜
             string remarks = HttpContext.Current.Request["remarks"].ToString();//澶囨敞
             string username = HttpContext.Current.Request["admin"].ToString();//鎿嶄綔浜哄憳
-            mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, reckway,usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
+            mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, inbarcode, reckway,usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
             return TJson.toJson(mes);
         }
         #endregion
@@ -219,6 +220,7 @@
             string stepseq = HttpContext.Current.Request["stepseq"].ToString();//宸ュ簭搴忓彿
             string stepcode = HttpContext.Current.Request["stepcode"].ToString();//宸ュ簭缂栫爜
             string wxcode = HttpContext.Current.Request["wxcode"].ToString();//澶栧崗渚涘簲鍟嗙紪鐮�
+            string inbarcode = HttpContext.Current.Request["inbarcode"].ToString(); //鍏ュ簱鏉$爜
             string inuser = HttpContext.Current.Request["inuser"].ToString();//鏀舵枡浜哄憳
             string taskqty = HttpContext.Current.Request["taskqty"].ToString();//浠诲姟鏁伴噺
             string sqty = HttpContext.Current.Request["sqty"].ToString();//鏀舵枡鏁伴噺
@@ -226,7 +228,7 @@
             string badcode = HttpContext.Current.Request["badcode"].ToString();//涓嶈壇鍘熷洜缂栫爜
             string remarks = HttpContext.Current.Request["remarks"].ToString();//澶囨敞
             string username = HttpContext.Current.Request["admin"].ToString();//鎿嶄綔浜哄憳
-            mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
+            mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inbarcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
             return TJson.toJson(mes);
         }
         #endregion

--
Gitblit v1.9.3