From 4545b915123fb7b7535b697f6e82b12f525f8b71 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 16 七月 2022 21:16:19 +0800
Subject: [PATCH] 工序检验接口编写

---
 VueWebApi/DLL/DAL/ProductModelDAL.cs |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 642940f..3ab2f66 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -446,7 +446,7 @@
                             from TMateriel_Info A
                             left join TUom B on A.uom_code=B.code
                             left join TMateriel_Type C on A.materieltype_code=C.code
-                            left join T_Dict D on C.dict_code=D.code and D.dict_type='CHLX'
+                            left join T_Dict D on A.stocktype_code=D.code and D.dict_type='CHLX'
                             left join T_Sec_Stck T on A.stck_code=T.code 
                             where A.is_delete<>'1' " + search;
                 var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -474,13 +474,14 @@
             {
                 if (operType == "Add")
                 {
-                    var sql = @"insert into TMateriel_Info(partcode,partname,partspec,uom_code,materieltype_code,stck_code,maxqty,minqty,lm_user,lm_date) 
-                            values(@materialcode,@materialname,@materialspec,@uomcode,@materialtypecode,@warehousecode,@maxstockqty,@minstockqty,@username,@CreateDate)";
+                    var sql = @"insert into TMateriel_Info(partcode,partname,partspec,uom_code,stocktype_code,materieltype_code,stck_code,maxqty,minqty,lm_user,lm_date) 
+                            values(@materialcode,@materialname,@materialspec,@uomcode,@stocktypecode,@materialtypecode,@warehousecode,@maxstockqty,@minstockqty,@username,@CreateDate)";
                     dynamicParams.Add("@materialcode", materialcode);
                     dynamicParams.Add("@materialname", materialname);
                     dynamicParams.Add("@materialspec", materialspec);
                     dynamicParams.Add("@uomcode", uomcode);
                     dynamicParams.Add("@warehousecode", warehousecode);
+                    dynamicParams.Add("@stocktypecode", stocktypecode);
                     dynamicParams.Add("@materialtypecode", materialtypecode);
                     dynamicParams.Add("@minstockqty", minstockqty);
                     dynamicParams.Add("@maxstockqty", maxstockqty);
@@ -504,13 +505,14 @@
                 }
                 if (operType == "Update")
                 {
-                    var sql = @"update TMateriel_Info set partname=@materialname,partspec=@materialspec,uom_code=@uomcode,materieltype_code=@materialtypecode,stck_code=@warehousecode,
+                    var sql = @"update TMateriel_Info set partname=@materialname,partspec=@materialspec,uom_code=@uomcode,stocktype_code=@stocktypecode,materieltype_code=@materialtypecode,stck_code=@warehousecode,
                                 maxqty=@maxstockqty,minqty=@minstockqty,lm_user=@username,lm_date=@CreateDate where id=@materialid";
                     dynamicParams.Add("@materialid", materialid);
                     dynamicParams.Add("@materialname", materialname);
                     dynamicParams.Add("@materialspec", materialspec);
                     dynamicParams.Add("@uomcode", uomcode);
                     dynamicParams.Add("@warehousecode", warehousecode);
+                    dynamicParams.Add("@stocktypecode", stocktypecode);
                     dynamicParams.Add("@materialtypecode", materialtypecode);
                     dynamicParams.Add("@minstockqty", minstockqty);
                     dynamicParams.Add("@maxstockqty", maxstockqty);

--
Gitblit v1.9.3