统计指标接口

topsun-xt/src/main/webapp/biz/topsun/sap/statsIndicators/statsIndicators.js

@@ -14,7 +14,7 @@ function initialize(){
 function loadStatsIndicatorsDetailListGrid() {
     var toolbarOptions = UICtrl.getDefaultToolbarOptions({
         addHandler: function () {
-            UICtrl.addGridRow(gridManager,{ zlenr: getZlenr() });
+            UICtrl.addGridRow(gridManager,{ zlenr: gridManager.getData().length + 1 });
         },
         deleteHandler: function () {
             gridManager.deleteSelectedRow();
@@ -24,45 +24,49 @@ function loadStatsIndicatorsDetailListGrid() {
         columns: [
             {
                 display: "行号", name: "zlenr", width: 140, minWidth: 60, type: "string", align: "left",
-                editor: { type: 'spinner', min: 1, max: 100, mask: 'nnn'}
+                //editor: { type: 'spinner', min: 1, max: 100, mask: 'nnn'}
             },
             {
-                display: "成本中心", name: "ekostl", width: 140, minWidth: 60, type: "string", align: "left",
+                display: "成本中心", name: "kostl", width: 140, minWidth: 60, type: "string", align: "left",
                 editor: {
-                    required: false, type: "select",
+                    required: true, type: "select",
                     data: {
                         type: 'system',
                         name: "queryCostCenter",
                         back: {
-                            kostl: "ekostl",
+                            kostl: "kostl",
                             // ktext:"ekostlTextView",
-                            null:"eaufnr"
+                            null:"aufnr"
                         }
                     },
                 }
             },
             {
-                display: "订单", name: "eaufnr", width: 120, minWidth: 60, type: "string", align: "left",
+                display: "订单", name: "aufnr", width: 120, minWidth: 60, type: "string", align: "left",
                 editor: {
-                    required: false, type: "select",
-                    data: {
+                    required: false, type: "text",
+                    /*data: {
                         type: 'system',
                         name: "sapMaterialSelect",
                         back: {
-                             null:"ekostl",
-                            materialId:"eaufnr"
+                             null:"kostl",
+                            materialId:"aufnr"
                         }
-                    },
+                    },*/
                 }
             },
             {
                 display: "统计指标", name: "stagr", width: 120, minWidth: 60, type: "string", align: "left",
-                editor: {
+                /*editor: {
                     required: true,
                     type: 'dictionary',
                     data: {name:'sex'} ,
                     textField:'stagrTextView',
                     valueField:'sex'
+                }*/
+                editor: {
+                    required: true,
+                    type: 'text'
                 }
             },
             {
@@ -149,11 +153,11 @@ function getExtendedData(processAction) {
 //获取最新子序号（维护实体的标识）
 function getZlenr(){
     let result =gridManager.getData();
-    let zlenr="001";
+    let zlenr="1";
     if(result.length>0){
         //获取上一个节点的子序值
         let wornNo= parseInt(result[result.length-1]["zlenr"], 10);
-        zlenr=("00" + (wornNo + 1)).slice(-3);
+        zlenr=((wornNo + 1)).slice(-3);
     }
     return zlenr;
 }
\ No newline at end of file

topsun-xt/src/main/webapp/biz/topsun/sap/statsIndicators/statsIndicators.jsp

@@ -34,7 +34,7 @@
                       wrapper="date"/>
         </div>
         <div class="hg-form-row">
-            <x:inputC name="bltxt" required="false" label="凭证文本" labelCol="2" fieldCol="6"/>
+            <x:inputC name="bltxt" required="true" label="凭证文本" labelCol="2" fieldCol="6"/>
         </div>
     </div>
     <div class="blank_div clearfix"></div>

topsun-xt/src/main/webapp/biz/topsun/sap/statsIndicators/statsIndicatorsList.js

@@ -28,14 +28,14 @@ function loadStatsIndicatorsListGrid() {
             {display: "NUMBER", name: "number", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "MESSAGE", name: "message", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "LOG_NO", name: "logNo", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "LOG_MSG_NO", name: "logMsgNo", width: 140, minWidth: 60, type: "string", align: "left"},
+            /*{display: "LOG_MSG_NO", name: "logMsgNo", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "MESSAGE_V1", name: "messageV1", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "MESSAGE_V2", name: "messageV2", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "MESSAGE_V3", name: "messageV3", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "MESSAGE_V4", name: "messageV4", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "ROW", name: "row", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "FIELD", name: "field", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "SYSTEM", name: "system", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "SYSTEM", name: "system", width: 140, minWidth: 60, type: "string", align: "left"},*/
             {display: "BELNR", name: "belnr", width: 140, minWidth: 60, type: "string", align: "left"},
         ],
         dataAction: "server",

topsun/src/main/java/com/huigou/topsun/sap/dictionary/application/impl/SapDictionaryApplicationImpl.java

@@ -33,7 +33,7 @@ public class SapDictionaryApplicationImpl implements SapDictionaryApplication {
         try {
             execute = httpClient.execute(map, url);
         } catch (IOException e) {
-            throw new RuntimeException(String.format("查询“%s数据字典出错”。", fieldName));
+            throw new RuntimeException(String.format("查询“%s“数据字典出错”。", fieldName));
         }
         List<Map<String,Object>> mapList = (List<Map<String,Object>>) JSONArray.parse(execute);
         return mapList;

topsun/src/main/java/com/huigou/topsun/sap/statsIndicators/application/impl/SapStatsIndicatorsApplicationImpl.java

@@ -41,6 +41,7 @@ import java.beans.IntrospectionException;
 import java.beans.Introspector;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -187,24 +188,32 @@ public class SapStatsIndicatorsApplicationImpl extends FlowBroker implements Sap
         }
         List<SapStatsIndicatorsDetail> all = sapStatsIndicatorsDetailRepository.findAllByStatsIndicatorsId(bizId);
         List<Map<String, Object>> list = new ArrayList<>();
-        ObjectMapper objectMapper = new ObjectMapper();
         Map<String, Object> map = MyBaseUtil.convertToMap(sapStatsIndicators,true);
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+        if (sapStatsIndicators.getBldat() !=null){
+            String bldat = dateFormat.format(sapStatsIndicators.getBldat());
+            map.put("BLDAT",bldat);
+        }
+        if (sapStatsIndicators.getBudat() != null){
+            String budat = dateFormat.format(sapStatsIndicators.getBudat());
+            map.put("BUDAT",budat);
+        }
         //封装参数
         for (SapStatsIndicatorsDetail sapStatsIndicatorsDetail : all) {
             Map<String, Object> detailMap = MyBaseUtil.convertToMap(sapStatsIndicatorsDetail,true);
-            map.put("ITEM", detailMap);
-            list.add(map);
+            list.add(detailMap);
         }
+        map.put("ITEM", list);
         String url = "cud_kb31n/kb31n";
         SapStatsIndicatorsResult sapStatsIndicatorsResult = new SapStatsIndicatorsResult();
         try {
-            String result = defaultHttpClient.execute(list, url);
+            String result = defaultHttpClient.execute(map, url);
             List<SapStatsIndicatorsResult> resultList = JSONObject.parseArray(result,SapStatsIndicatorsResult.class);
             //List<SapStatsIndicatorsResult> resultList = objectMapper.readValue(result, new TypeReference<List<SapStatsIndicatorsResult>>() {});
 
             sapStatsIndicatorsResult = resultList.get(0);
 
-            if (!"s".equals(sapStatsIndicatorsResult.getTYPE())) {
+            if (!"S".equals(sapStatsIndicatorsResult.getTYPE())) {
                 throw new RuntimeException("数据传输失败，请稍后手动重试！");
             }
         } catch (IOException e) {

topsun/src/main/java/com/huigou/topsun/sap/statsIndicators/domain/SapStatsIndicatorsDetail.java

@@ -50,14 +50,14 @@ public class SapStatsIndicatorsDetail {
     /**
      * 成本中心
      */
-    @Column(name = "EKOSTL")
-    private String ekostl;
+    @Column(name = "KOSTL")
+    private String kostl;
 
     /**
      * 订单
      */
-    @Column(name = "EAUFNR")
-    private String eaufnr;
+    @Column(name = "AUFNR")
+    private String aufnr;
 
     /**
      * 统计指标