成本中心领料需在bpm增加用途

topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickDetail.js

@@ -4,6 +4,7 @@ $(document).ready(function () {
     initialize();
     loadGrid();
     bindEvent();
+    initUsed($('#kostl').val());
 });
 function initialize(){
     UICtrl.layout("#layout", {leftWidth: 3});
@@ -47,6 +48,7 @@ function bindEvent(){
                 $('#aufnrName').val(null);
                 Public.tip("选择成本中心，不能选择内部订单");
             }
+            initUsed(data.KOSTL);
         }
     });
     $('#aufnrName').searchbox({
@@ -64,6 +66,7 @@ function bindEvent(){
                 $('#kostlName').val(null);
                 Public.tip("选择内部订单，不能选择成本中心");
             }
+            initUsed("");
         }
     });
 }
@@ -156,8 +159,17 @@ function loadGrid() {
                 editor: {type: "text",maxLength:500 }
             },
             {
-                display: "备注用途", name: "used", width: 200, minWidth: 60, type: "string", align: "left",
-                editor: { type: "text",maxLength:500 }
+                display: "备注用途", name: "usedTextView", width: 200, minWidth: 60, type: "string", align: "left",
+                editor: {
+                    type: 'dictionary',
+                    data: {name: 'used'},
+                    textField: 'usedTextView',
+                    valueField: 'used',
+                    required: true,
+                    render: function (item) {
+                        return item.usedTextView;
+                    }
+                },
             },
             // {
             //    display: "", name: "remark", width: 300, minWidth: 60, type: "string", align: "left",
@@ -188,6 +200,20 @@ function loadGrid() {
     UICtrl.setSearchAreaToggle(gridManager);
 }
 
+function initUsed(kostl){
+    var columns = gridManager.columns;
+    columns.some(column => {
+        if (column.name == "used"){
+            column.editor.required = Public.isNotBlank(kostl)? true:false;
+            return true;
+        }
+        return false;
+    })
+
+    columns.splice(0,1)
+    UICtrl.setGridColumns(gridManager,columns);
+}
+
 /**
  * 流程引擎回调设置打样的id
  * @param value 打样申请的id

topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickList.js

@@ -35,7 +35,7 @@ function loadGrid() {
             {display: "数量", name: "erfmg", width: 100, minWidth: 60, type: "string", align: "left",},
             {display: "计量单位", name: "msehl", width: 90, minWidth: 60, type: "string", align: "left",},
             {display: "领料方", name: "wempf", width: 200, minWidth: 60, type: "string", align: "left",},
-            {display: "备注用途", name: "used", width: 200, minWidth: 60, type: "string", align: "left",},
+            {display: "备注用途", name: "usedTextView", width: 200, minWidth: 60, type: "string", align: "left",},
             {display: "审批状态", name: "statusTextView", width: 100, minWidth: 60, type: "string", align: "left"},
             {display: "消息类型", name: "typeTextView", width: 100, minWidth: 60, type: "string", align: "left"},
         ],

topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/application/impl/NonProducePickApplicationImpl.java

@@ -2,6 +2,7 @@ package com.huigou.topsun.sap.nonProducePick.application.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.huigou.cache.DictUtil;
 import com.huigou.data.domain.model.CommonDomainConstants;
 import com.huigou.data.query.model.QueryDescriptor;
 import com.huigou.data.query.model.QueryModel;
@@ -106,6 +107,7 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
             nonProducePickItemVo.setWerks(nonProducePick.getWerks());
             nonProducePickItemVo.setErfme(pickItem.getMeins());
             nonProducePickItemVo.setResItem(pickItem.getRspos());
+            nonProducePickItemVo.setZtext(DictUtil.getDictionaryDetailText("used",pickItem.getUsed()));
             return nonProducePickItemVo;
         }).collect(Collectors.toList());
         nonProducePickVo.setItems(pickItemVoList);

topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/controller/NonProducePickController.java

 package com.huigou.topsun.sap.nonProducePick.controller;
 
+import com.huigou.cache.DictUtil;
 import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
 import com.huigou.data.domain.query.QueryPageRequest;
@@ -28,6 +29,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -95,6 +97,13 @@ public class NonProducePickController extends CommonController {
         map.put("itemList", itemList);
         BigDecimal bigDecimal = itemList.stream().map(NonProducePickItem::getErfmg).reduce(BigDecimal.ZERO, BigDecimal::add);
         map.put("count",bigDecimal);
+        Set<String> usedSet = itemList.stream()
+                .map(nonProducePickItem -> {
+                    return DictUtil.getDictionaryDetailText("used",nonProducePickItem.getUsed());
+                })
+                .collect(Collectors.toSet());
+        String used = String.join(",", usedSet);
+        map.put("used",used);
         File file = new File(nonProducePick.getMessage()+".png");
         if(!file.exists()) {
             String IMG_TYPE_PNG = "image/png";

topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/vo/NonProducePickItemVo.java

@@ -61,4 +61,15 @@ public class NonProducePickItemVo implements Serializable {
     @JsonProperty("RES_ITEM")
     private String resItem;
 
+    /**
+     * 用途
+     */
+    @JsonProperty("ZYTBM")
+    private String used;
+
+    /**
+     * 用途描述
+     */
+    @JsonProperty("ZTEXT")
+    private String ztext;
 }