Просмотр исходного кода

后台:
1、复制配置功能修复,复制配置弹窗 = 增加旧物料名称搜索
2、增加副规格保存报错问题

MY 1 день назад
Родитель
Сommit
96792e7215

+ 1 - 1
JLHHJSvr/DataStore/web_mattress_choose.xml

@@ -69,7 +69,7 @@ FROM u_mattress
 		u_mattress.deptid in ($$user_deptstr$$)
 	</when>
 	<when notnull="@arg_search">
-		EXISTS (SELECT 1 FROM dbo.SC_SPLIT(@arg_search, ',') A WHERE A.Item <> '' AND (u_mattress.mattresscode LIKE '%'+LTRIM(RTRIM(A.Item))+'%' OR u_mattress.mattressrelcode like '%'+LTRIM(RTRIM(A.Item))+'%' OR u_mattress.mattressname like '%'+LTRIM(RTRIM(A.Item))+'%'))
+		EXISTS (SELECT 1 FROM dbo.SC_SPLIT(@arg_search, ',') A WHERE A.Item <> '' AND (u_mattress.mattresscode LIKE '%'+LTRIM(RTRIM(A.Item))+'%' OR u_mattress.mattressrelcode like '%'+LTRIM(RTRIM(A.Item))+'%' OR u_mattress.mattressname like '%'+LTRIM(RTRIM(A.Item))+'%')) OR EXISTS (SELECT 1 FROM u_mtrldef WHERE usermtrlmode LIKE '%' + @arg_search + '%')
 	</when>
 	<when notnull="@arg_erp_mtrlcode">
 		EXISTS (SELECT 1 FROM dbo.SC_SPLIT(@arg_erp_mtrlcode, ',') A WHERE A.Item <> '' AND (u_mattress.erp_mtrlcode LIKE '%'+LTRIM(RTRIM(A.Item))+'%'))

+ 2 - 2
JLHHJSvr/Excutor/GetComputeSpringExcutor.cs

@@ -85,11 +85,11 @@ namespace JLHHJSvr.Excutor
 
                 }
 
-                if (request.spring.Count > 0)
+                if (request.spring != null && request.spring.Count > 0)
                 {
                     springList = request.spring;
                 }
-                else if (request.bednetMx[0].if_part.Value > 0)
+                else if (request.bednetMx[0].if_part != null && request.bednetMx[0].if_part.Value > 0)
                 {
                     springList = helper.GetBedNetSpringList(request.bednet.bednetid.Value);
                 }