From eddeff0b81ea84c3b66ab1b8b7943146f953b0e1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 13 二月 2023 17:17:05 +0800
Subject: [PATCH] 1.往来单位同步修改(客户、供应商、客户/供应商) 2.往来单位新增/编修 :单位属性改为(客户、供应商、客户/供应商) 3.生产开报工PC端、APP端:外协工序时外协供应商(供应商、客户/供应商) 4.委外工序明细报表:(供应商、客户/供应商) 5.工序定义关联工作站(供应商、客户/供应商) 6.综合看板右上角字段(供应商、客户/供应商) 7.采购订单看板(供应商、客户/供应商) 8.采购订单关闭接口开发

---
 VueWebApi/Controllers/ProductModelController.cs |   31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/VueWebApi/Controllers/ProductModelController.cs b/VueWebApi/Controllers/ProductModelController.cs
index f74dcc1..386be16 100644
--- a/VueWebApi/Controllers/ProductModelController.cs
+++ b/VueWebApi/Controllers/ProductModelController.cs
@@ -17,7 +17,7 @@
 
     [RoutePrefix(prefix: "api/ProductModel")]
     [ControllerGroup("鍒堕�犳ā鍨�", "鍦ㄧ嚎鎺ュ彛")]
-    //[ChannelActionFilter]
+    [ChannelActionFilter]
     public class ProductModelController : ApiController
     {
         //瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -243,9 +243,13 @@
             string materialtypecode = obj["materialtypecode"].ToString(); //鐗╂枡绫诲瀷缂栫爜
             string minstockqty = obj["minstockqty"].ToString(); //鏈�灏忓簱瀛�
             string maxstockqty = obj["maxstockqty"].ToString(); //鏈�澶у簱瀛�
+            string is_batchno = obj["is_batchno"].ToString();   //鏄惁鎵规绠$悊
+            string is_fifo = obj["is_fifo"].ToString();         //鏄惁鍏堣繘鍏堝嚭
+            string is_incheck = obj["is_incheck"].ToString();   //鏄惁鍏ュ巶妫�楠�
+            string is_outcheck = obj["is_outcheck"].ToString(); //鏄惁鍑哄巶妫�楠�
             var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
             string OperType = obj["OperType"].ToString();  //鎿嶄綔绫诲瀷
-            mes = ProductModelBLL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, materialtypecode, minstockqty, maxstockqty, username, OperType);
+            mes = ProductModelBLL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, materialtypecode, minstockqty, maxstockqty,is_batchno,is_fifo,is_incheck,is_outcheck, username, OperType);
             return TJson.toJson(mes);
         }
         #endregion
@@ -381,10 +385,10 @@
             string status = obj["status"].ToString();//鍚敤鐘舵��
             string uomcode = obj["uomcode"].ToString(); //璁¢噺鍗曚綅缂栫爜
             string quantity = obj["quantity"].ToString(); //鍩虹鏁伴噺
-            string startdate = obj["startdate"].ToString(); //鍩虹鏁伴噺
-            string version = obj["version"].ToString(); //鍩虹鏁伴噺
-            string worklist = obj["worklist"].ToString(); //鍩虹鏁伴噺
-            string opertype = obj["opertype"].ToString(); //鍩虹鏁伴噺
+            string startdate = obj["startdate"].ToString(); //鍚敤鏃ユ湡
+            string version = obj["version"].ToString(); //鐗堟湰鍙�
+            string worklist = obj["worklist"].ToString(); //鎻愪氦鏁版嵁
+            string opertype = obj["opertype"].ToString(); //鎻愪氦绫诲瀷
             string username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
             List<BomSub> objs = Newtonsoft.Json.JsonConvert.DeserializeObject<List<BomSub>>(worklist);
             mes = ProductModelBLL.AddUpdateBoIventory(bomid,parentpartcode, parentpartname, parentpartspec, status, uomcode, quantity, startdate, version, username, opertype, objs);
@@ -392,6 +396,21 @@
         }
         #endregion
 
+        #region[鐗╂枡娓呭崟鍒犻櫎]
+        /// <summary>
+        /// 鐗╂枡娓呭崟鍒犻櫎
+        /// </summary>
+        /// <param name="bomid">Bom涓昏〃id</param>
+        /// <returns></returns>
+        [Route(template: "DeleteBoIventory")]
+        [HttpPost]
+        public HttpResponseMessage DeleteBoIventory(string bomid)
+        {
+            mes = ProductModelBLL.DeleteBoIventory(bomid);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
 
 
 

--
Gitblit v1.9.3