物料清单前端校验优化

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java

@@ -95,7 +95,6 @@ public class ServiceHPSC002 extends ServiceBase {
 					this.modify(hpsc002);
 				}
 			}
-			inInfo = this.query(inInfo);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
 			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
 		} catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml

@@ -109,13 +109,43 @@
         </isNotEmpty>
     </sql>
 
+	<sql id="condition1">
+		<isNotEmpty prepend=" AND " property="id">
+			A.ID = #id#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="parentId">
+			A.PARENT_ID = #parentId#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="prdtType">
+			A.PRDT_TYPE = #prdtType#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="prdtCode">
+			A.PRDT_CODE = #prdtCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="prdtName">
+			A.PRDT_NAME LIKE CONCAT('%', #prdtName#, '%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventRecordId">
+			A.INVENT_RECORD_ID = #inventRecordId#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="projName">
+			A.PROJ_NAME LIKE CONCAT('%', #projName#, '%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="status">
+			A.STATUS = #status#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="lv">
+			A.LV = #lv#
+		</isNotEmpty>
+	</sql>
+
     <sql id="order">
         <dynamic prepend="ORDER BY">
             <isNotEmpty property="order">
                 $order$
             </isNotEmpty>
             <isEmpty property="order">
-                ID DESC
+                A.ID DESC
             </isEmpty>
         </dynamic>
     </sql>
@@ -128,7 +158,7 @@
 		WHERE 1=1
         AND PARENT_ID NOT IN ('root')
         AND DEL_STATUS = 0
-		<include refid="condition"/>
+		<include refid="condition1"/>
         <include refid="order"/>
 	</select>
 

src/main/webapp/HP/SC/HPSC002.js

@@ -178,14 +178,7 @@ $(function () {
             onSave: function (e) {
                 e.preventDefault();
                 saveFunc();
-                // 不向后台保存
-                var tree = $("#materialTree").data("kendoTreeView");
-                var inInfo = new EiInfo();
-                EiCommunicator.send("HPSC002", "queryTreeNode", inInfo, {//传入参数
-                    onSuccess: function (inInfo) {
-                        setTimeout(function(){ tree.reload("root");}, 500);//更新树
-                    }
-                });
+
             },
             /**
              * 点击Grid删除按钮时触发的事件
@@ -195,15 +188,7 @@ $(function () {
             onDelete: function (e) {
                 e.preventDefault();
                 deleteFunc();
-                // 不向后台保存
-                console.log("DELETE -> ", e)
-                var tree = $("#materialTree").data("kendoTreeView");
-                var inInfo = new EiInfo();
-                EiCommunicator.send("HPSC002", "queryTreeNode", inInfo, {//传入参数
-                    onSuccess: function (inInfo) {
-                        tree.reload("root");//更新树
-                    }
-                });
+
             },
             toolbarConfig: {
                 hidden: false, // true时，不显示功能按钮，但保留setting导出按钮
@@ -506,6 +491,14 @@ $(window).load(function () {
  */
 let query = function () {
     resultGrid.dataSource.page(1);
+    //更新树
+    var tree = $("#materialTree").data("kendoTreeView");
+    var inInfo = new EiInfo();
+    EiCommunicator.send("HPSC002", "queryTreeNode", inInfo, {//传入参数
+        onSuccess: function (inInfo) {
+            tree.reload("root");//更新树
+        }
+    });
 }
 function openUploadFile(id) {
     uploadFileWindow.open().center();