工序外协增加生产单带出的字段

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

@@ -107,11 +107,24 @@ function getOrderColumns(){
                 back: {
                     AUFNR: "aufnr",
                     VORNR: "wempf",
-                    LTXA1: "txz01"
+                    LTXA1: "txz01",
+                    PLNBEZ: "productCode",
+                    MAKTX: "productName",
+                    MTART: "productType",
+                    MTBEZ: "productTypeName",
                 }
             }
         }
     });
+    columns.push({
+        display: "产品类别", name: "productTypeName", width: 140, minWidth: 60, type: "string", align: "left",
+    },);
+    columns.push({
+        display: "产品编码", name: "productCode", width: 140, minWidth: 60, type: "string", align: "left",
+    },);
+    columns.push({
+        display: "产品名称", name: "productName", width: 200, minWidth: 60, type: "string", align: "left",
+    },);
     columns.push({
         display: "工序号", name: "wempf", width: 140, minWidth: 60, type: "string", align: "left",
         editor: {

topsun/src/main/java/com/huigou/topsun/sap/processOutsource/domain/ProcessOutsourceOrderItem.java

@@ -149,4 +149,28 @@ public class ProcessOutsourceOrderItem extends AbstractEntity {
     @Column(name = "WAERS")
     private String waers;
 
+    /**
+     * 产品编码
+     */
+    @Column(name = "PRODUCT_CODE")
+    private String productCode;
+
+    /**
+     * 产品名称
+     */
+    @Column(name = "PRODUCT_NAME")
+    private String productName;
+
+    /**
+     * 产品类别
+     */
+    @Column(name = "PRODUCT_TYPE")
+    private String productType;
+
+    /**
+     * 产品类别描述
+     */
+    @Column(name = "PRODUCT_TYPE_NAME")
+    private String productTypeName;
+
 }

topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/impl/SapMaterialApplicationImpl.java

@@ -21,6 +21,9 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
+
+import static org.apache.commons.lang3.RegExUtils.replaceFirst;
 
 /**
  * @Auther: xin.lu
@@ -80,17 +83,44 @@ public class SapMaterialApplicationImpl implements SapMaterialApplication {
             orderQueryVo.setKUNNR(kunnrList);
         }
         if (StringUtils.isNotBlank(queryRequest.getParamValue())) {  //过滤参数 按订单号查询
-                signVo=new SignVo();
-                signVo.setLow("*"+queryRequest.getParamValue()+"*");
-                signVo.setOption("CP");
-                List <SignVo> vbelnList=new ArrayList<>();
-                vbelnList.add(signVo);
+            List <SignVo> vbelnList=new ArrayList<>();
                 if ("3".equals(queryRequest.getReasonType())) { //如果是客户异常
+                    //可能是多个客户单号
+                    String paramValue = queryRequest.getParamValue();
+                    String[] split = paramValue.split(",");
+                    List<String> paramValues = Arrays.asList(split);
+                    for (String value : paramValues) {
+                        signVo=new SignVo();
+                        signVo.setLow(value);
+                        signVo.setOption("EQ");
+                        vbelnList.add(signVo);
+                    }
                     orderQueryVo.setBSTNK(vbelnList);
                 } else {   // 是生产异常
+                    signVo=new SignVo();
+                    signVo.setLow("*"+queryRequest.getParamValue()+"*");
+                    signVo.setOption("CP");
+                    vbelnList.add(signVo);
                     orderQueryVo.setAUFNR(vbelnList);
                 }
        }
+        //客户异常，根据生产单号查询
+        if (StringUtils.isNotBlank(queryRequest.getAufnr())){
+            if ("3".equals(queryRequest.getReasonType())){
+                List <SignVo> vbelnList=new ArrayList<>();
+                String aufnr = queryRequest.getAufnr();
+                String[] split = aufnr.split(",");
+                List<String> aufnrs = Arrays.asList(split);
+                for (String s : aufnrs) {
+                    signVo=new SignVo();
+                    String newStr = s.replaceFirst("^0*", "");
+                    signVo.setLow(newStr);
+                    signVo.setOption("EQ");
+                    vbelnList.add(signVo);
+                }
+                orderQueryVo.setAUFNR(vbelnList);
+            }
+        }
         if ("3".equals(queryRequest.getReasonType())){ //如果是客户异常
                 List <SignVo>auartList=new ArrayList<>();
                 signVo=new SignVo();
@@ -105,11 +135,16 @@ public class SapMaterialApplicationImpl implements SapMaterialApplication {
          }
 
         if  (StringUtils.isNotBlank(queryRequest.getVbeln())&&"3".equals(queryRequest.getReasonType())) { //客户单号
-
-             signVo=new SignVo();
-             signVo.setLow(queryRequest.getVbeln());
-             List <SignVo> vbelnList=new ArrayList<>();
-             vbelnList.add(signVo);
+            String vbeln = queryRequest.getVbeln();
+            String[] split = vbeln.split(",");
+            List<String> vbelns = Arrays.asList(split);
+            List <SignVo> vbelnList=new ArrayList<>();
+            for (String s : vbelns) {
+                signVo=new SignVo();
+                signVo.setLow(s);
+                signVo.setOption("EQ");
+                vbelnList.add(signVo);
+            }
              orderQueryVo.setBSTNK(vbelnList);
         }
            Object obj =  JSONObject.toJSON(orderQueryVo);
@@ -121,7 +156,8 @@ public class SapMaterialApplicationImpl implements SapMaterialApplication {
                      json = httpClient.execute(obj, InterfaceName);
                      mapList = JSONUtil.toListMap(json);
                 }
-            } else {  //生产异常
+            } else
+            {  //生产异常
                  Map<String,Object> param = new HashMap<>();
                  param.put("BUKRS",queryRequest.getWerks());
                  if (StringUtils.isNotBlank(queryRequest.getVbeln())){ //生产订单号
@@ -171,9 +207,10 @@ public class SapMaterialApplicationImpl implements SapMaterialApplication {
             }
          if (StringUtils.isNotBlank(queryRequest.getVbeln())) { //按生产订单号
              for (Map map : mapList) {
-                 Map newMap = new HashMap();
                  List<Map<String, Object>> mapList2=(List<Map<String, Object>>)map.get("ITEM");
                  for (Map mapItem:mapList2) {
+                     Map newMap = new HashMap();
+                     newMap.put("BSTNK", map.get("BSTNK"));  //客户单号
                      newMap.put("MATNR", mapItem.get("MATNR"));  //物料编号
                      newMap.put("MAKTX", mapItem.get("MAKTX"));   //物料名称
                      newMap.put("AUFNR", mapItem.get("AUFNR"));  //生产单号