固定资产优化

huigou-xt/src/main/webapp/javaScript/WEB_APP.js

-var web_app={name:'/topsun-bpm'};
+var web_app={name:'/topsun'};
\ No newline at end of file

topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssess/sapFixedAssessDetail.js

@@ -45,7 +45,7 @@ function loadGrid() {
             {
                 display: "公司代码", name: "bukrs", width: 140, minWidth: 60, type: "string", align: "left",
                 editor: {
-                    required: false, type: "select",
+                    required: true, type: "select",
                     data: {
                         type: 'system',
                         name: "dictionary",
@@ -77,15 +77,15 @@ function loadGrid() {
 
             {
                 display: "凭证日期", name: "bldat", width: 120, minWidth: 60, type: "date", align: "left",
-                editor: {required: false, type: "date"}
+                editor: {required: true, type: "date"}
             },
             {
                 display: "过账日期", name: "budat", width: 120, minWidth: 60, type: "date", align: "left",
-                editor: {required: false, type: "date"}
+                editor: {required: true, type: "date"}
             },
             {
                 display: "资产起息日", name: "bzdat", width: 120, minWidth: 60, type: "date", align: "left",
-                editor: {required: false, type: "date"},
+                editor: {required: true, type: "date"},
                 render : function (record) {
                     return record.bzdat = record.budat;
                 }
@@ -96,7 +96,7 @@ function loadGrid() {
             },
             {
                 display: "接收方", name: "empge", width: 180, minWidth: 60, type: "string", align: "left",
-                editor: {required: false, type: "text"}
+                editor: {required: true, type: "text"}
             },
             {
                 display: "百分比(%)", name: "prozs", width: 100, minWidth: 60, type: "string", align: "left",
@@ -193,6 +193,7 @@ function getExtendedData(processAction) {
         $('#submitForm').attr('check', false);
     }
     var extendedData = {};
+    var checked = false;
     var _grid = UICtrl.getGridManager('#maingrid');
     if (_grid) {
         var datas = DataUtil.getGridData({
@@ -203,6 +204,15 @@ function getExtendedData(processAction) {
         if (!datas) {
             return false;
         }
+        $.each(datas, function (i , o) {
+            if (Public.isBlank(o.betrr) && Public.isBlank(o.prozs)){
+                checked = true;
+            }
+        })
+        if (checked){
+            Public.tip("报废金额和百分比(%)不能同时为空");
+            return false
+        }
         extendedData.items = Public.encodeJSONURI(datas);
     }
     return extendedData;

topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsDetail.js

@@ -32,7 +32,10 @@ function bindQueryEvent() {
     $('#anlkl').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {
-            return {fieldName: "ANLKL"}
+            return {
+                fieldName: "ANLKL",
+                filterValue: "Z"
+            }
         },
         onChange: function (value, data) {
             $('#anlkl').val(data.ANLKL);

topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedRetirement/sapFixedRetirementDetail.js

@@ -45,7 +45,7 @@ function loadGrid() {
             {
               display: "公司代码", name: "bukrs", width: 140, minWidth: 60, type: "string", align: "left",
                 editor: {
-                    required: false, type: "select",
+                    required: true, type: "select",
                     data: {
                         type: 'system',
                         name: "dictionary",
@@ -86,15 +86,15 @@ function loadGrid() {
             }, */
             {
                 display: "凭证日期", name: "bldat", width: 120, minWidth: 60, type: "date", align: "left",
-                editor: {required: false, type: "date"}
+                editor: {required: true, type: "date"}
             },
             {
                 display: "过账日期", name: "budat", width: 120, minWidth: 60, type: "date", align: "left",
-                editor: {required: false, type: "date"}
+                editor: {required: true, type: "date"}
             },
             {
                 display: "资产起息日", name: "bzdat", width: 120, minWidth: 60, type: "date", align: "left",
-                editor: {required: false, type: "date"},render : function (record) {
+                editor: {required: true, type: "date"},render : function (record) {
                     //alert(record.budat);
                     return  record.bzdat=record.budat;
                 }
@@ -202,6 +202,7 @@ function getExtendedData(processAction) {
         $('#submitForm').attr('check', false);
     }
     var extendedData = {};
+    var checked = false;
     var _grid = UICtrl.getGridManager('#maingrid');
     if (_grid) {
         var datas = DataUtil.getGridData({
@@ -212,6 +213,15 @@ function getExtendedData(processAction) {
         if (!datas) {
             return false;
         }
+        $.each(datas, function (i , o) {
+            if (Public.isBlank(o.anbtr) && Public.isBlank(o.prozs)){
+                checked = true;
+            }
+        })
+        if (checked){
+            Public.tip("报废金额和百分比(%)不能同时为空");
+            return false
+        }
         extendedData.items = Public.encodeJSONURI(datas);
     }
     return extendedData;

topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java

@@ -160,7 +160,8 @@ public class ResourceSearchController {
             if (StringUtil.isNotBlank(filterValue)){//固定条件过滤，比如选了工厂后，只能读取改工厂下的物料组
                 mapList = mapList
                         .stream()
-                        .filter(map -> map.containsValue(filterValue))
+                        .filter(map -> map.values().stream().anyMatch(value->value.contains(filterValue)))
+                        //.filter(map -> map.containsValue(filterValue))
                         .collect(Collectors.toList());
             }
             if (StringUtil.isNotBlank(param)){//输入查询条件过滤