工序外协申请字段调整，补数工单取值逻辑调整

topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceDetail.js

@@ -45,7 +45,11 @@ function loadOrderItemGrid() {
             UICtrl.addGridRow(orderItemGridManager,
                 {
                     // 行号加一
-                    sequence: (orderItemGridManager.getData().length + 1)
+                    sequence: (orderItemGridManager.getData().length + 1),
+                    kpein: 1,
+                    waersTextView: "人民币",
+                    waers: "CNY"
+
                 }
             );
         },
@@ -69,7 +73,7 @@ function loadOrderItemGrid() {
             {display: "采购订单", name: "ebeln", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "订单行项目号", name: "ebelp", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "序号", name: "sequence", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "工单", name: "aufnr", width: 200, minWidth: 60, type: "string", align: "left",
+            {display: "原工单", name: "aufnr", width: 200, minWidth: 60, type: "string", align: "left",
                 editor: {
                     required: true, type: "select",
                     data: {
@@ -94,7 +98,11 @@ function loadOrderItemGrid() {
                     type:"text",required: true
                 }
             },
-            {display: "同一工序外发次数", name: "ablad", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "补数工单", name: "ablad", width: 140, minWidth: 60, type: "string", align: "left",
+                editor:{
+                    type:"text",required: false
+                }
+            },
             {display: "数量", name: "menge", width: 140, minWidth: 60, type: "string", align: "left",
                 editor:{
                     type:"text",mask: '9999999.999',required: true

topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceList.js

@@ -18,23 +18,23 @@ function loadProcessOutsourceOrderListGrid() {
         columns: [
             {display: "申请单编号", name: "billCode", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "申请状态", name: "statusTextView", width: 60, minWidth: 60, type: "string", align: "left"},
-            {display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
-            {display: "工厂", name: "werks", width: 80, minWidth: 60, type: "string", align: "left"},
+            {display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "datetime", align: "left"},
+            {display: "工厂", name: "werksName", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "采购订单", name: "ebeln", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "订单行项目号", name: "ebelp", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "序号", name: "sequence", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "工单", name: "aufnr", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "原工单", name: "aufnr", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "工序号", name: "wempf", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "工序描述", name: "txz01", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "同一工序外发次数", name: "ablad", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "补数工单", name: "ablad", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "单价", name: "kbetr", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "数量", name: "menge", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "单位", name: "meinsName", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "定价基数", name: "kpein", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "币别", name: "waersTextView", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "税码", name: "purchaseMwskzTextView", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "需求到货日期", name: "eeind", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "供应商", name: "lifnrName", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "需求到货日期", name: "eeind", width: 140, minWidth: 60, type: "date", align: "left"},
+            {display: "供应商", name: "lifnrName", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "申请部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
 

topsun/src/main/java/com/huigou/topsun/sap/processOutsource/application/impl/ProcessOutsourceApplicationImpl.java

@@ -192,13 +192,18 @@ public class ProcessOutsourceApplicationImpl extends FlowBroker implements Proce
                 //根据供应商封装一个ProcessOutsourceVo类
                 if (lifnrSet.equals(processOutsourceOrderItem.getLifnr())){
                     //自动计数器，匹配条件为“如果之前状态为通过的申请中有相同工单+工序，则计数器+1，起始为1”
-                    List<ProcessOutsourceOrderItem> outsourceOrderItemList = processOutsourceOrderItemRepository
-                            .findByAufnrAndWempf(processOutsourceOrderItem.getAufnr(), processOutsourceOrderItem.getWempf());
-                    List<ProcessOutsourceOrderItem> collect = outsourceOrderItemList
-                            .stream()
-                            .filter(processOutsourceOrderItem1 -> StringUtil.isNotBlank(processOutsourceOrderItem1.getAblad()))
-                            .collect(Collectors.toList());
-                    processOutsourceOrderItem.setAblad(String.valueOf(collect.size() + 1));
+//                    List<ProcessOutsourceOrderItem> outsourceOrderItemList = processOutsourceOrderItemRepository
+//                            .findByAufnrAndWempf(processOutsourceOrderItem.getAufnr(), processOutsourceOrderItem.getWempf());
+//                    List<ProcessOutsourceOrderItem> collect = outsourceOrderItemList
+//                            .stream()
+//                            .filter(processOutsourceOrderItem1 -> StringUtil.isNotBlank(processOutsourceOrderItem1.getAblad()))
+//                            .collect(Collectors.toList());
+                    //手工填写，必须以“原工单”字段的内容作为开头部分；若值为空，传输“AUFNR”字段值
+                    if (StringUtil.isNotBlank(processOutsourceOrderItem.getAblad())){
+                        processOutsourceOrderItem.setAblad(processOutsourceOrderItem.getAufnr()+"-"+processOutsourceOrderItem.getAblad());
+                    }else {
+                        processOutsourceOrderItem.setAblad(processOutsourceOrderItem.getAufnr());
+                    }
                     //ProcessOutsourceItemVo类组装数据
                     ProcessOutsourceItemVo processOutsourceItemVo = new ProcessOutsourceItemVo();
                     BeanUtil.copyProperties(processOutsourceOrderItem,processOutsourceItemVo);
@@ -319,6 +324,7 @@ public class ProcessOutsourceApplicationImpl extends FlowBroker implements Proce
     public Map<String, Object> slicedProcessOutsourceList(ProcessOutsourceQueryRequest queryRequest) {
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedProcessOutsourceList");
         QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
+        queryModel.putDictionary("status",BizBillStatus.getMap());
         return this.sqlExecutorDao.executeSlicedQuery(queryModel);
     }