工单增加面别和工单数组

src/main/java/com/neotel/smfcore/core/order/rest/bean/dto/OrderDto.java

@@ -110,9 +110,16 @@ public class OrderDto implements Serializable {
 
     @ApiModelProperty(value = "工单是否欠料发料")
     private Boolean shortageOut;
-//   @ApiModelProperty("建议出仓时间")
-//   private Date sdate=new Date();
 
-//    @ApiModelProperty("工单线别")
-//    private String line = "";
+    /**
+     * 包含的工单信息(数组)
+     */
+    @ApiModelProperty(value = "包含的工单号数组")
+    private List<String> subWknumList;
+
+    /**
+     *  面别
+     */
+    @ApiModelProperty(value = "面别")
+    private String wktype;
 }

src/main/java/com/neotel/smfcore/core/order/rest/bean/query/OrderQueryCondition.java

@@ -22,7 +22,7 @@ public class OrderQueryCondition {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private BetweenData<Date> startDate;
 
-    @QueryCondition(type = QueryCondition.Type.IN, propName = "orderNo")
+    @QueryCondition(type = QueryCondition.Type.IN, propName = "subWknumList")
     private List<String> orderNoList;
 
     @QueryCondition(type = QueryCondition.Type.IN, propName = "source")

src/main/java/com/neotel/smfcore/hikvision/bean/HikOrderInfo.java

 package com.neotel.smfcore.hikvision.bean;
 
+import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.annotation.Transient;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 @Slf4j
 @Getter
@@ -83,8 +87,27 @@ public class HikOrderInfo implements Serializable {
      *increment	Integer	true	发料增量
      */
     protected int prepareIncrement=0;
+    /**
+     * 包含的工单信息
+     */
+    private String subWknum;
+
+    /**
+     * 包含的工单信息,存数据库
+     */
+    private List<String> subWknumList;
+
+    /**
+     *  面别
+     */
+    private String wktype;
+
+    public void setSubWknum(String subWknum) {
+        this.subWknum = subWknum;
+        subWknumList = Lists.newArrayList(subWknum.split(","));
+    }
 
-//    public int getIncrement(){
+    //    public int getIncrement(){
 //        if(increment<=0&&prepareIncrement>=0){
 //            return prepareIncrement;
 //        }

src/main/java/com/neotel/smfcore/hikvision/util/JsonUtil.java

@@ -88,7 +88,7 @@ public class JsonUtil {
     }
 
     public static void main(String args[]) throws Exception{
-        String jsonStr = "{\"code\":\"000000\",\"data\":{\"reqCode\":\"2022062018550110000347\",\"code\":0,\"message\":\"success\",\"data\":[{\"jobNo\":\"1526710801_1\",\"station\":\"1_50004_L_NPM-3\",\"baseCode\":\"8001\",\"lgort\":\"M9142\",\"workLine\":\"S111\",\"startDate\":\"2022-06-21 17:57:24\",\"endDate\":\"2022-06-21 19:21:00\",\"materialNo\":\"100300266\",\"qty\":76,\"stationCount\":1,\"overFlag\":0,\"prepareIncrement\":0,\"wemng\":50,\"docType\":1,\"replenishmentNo\":null},{\"jobNo\":\"1526710801_1\",\"station\":\"1_30009_R_NPM-2\",\"baseCode\":\"8001\",\"lgort\":\"M9142\",\"workLine\":\"S111\",\"startDate\":\"2022-06-21 17:57:24\",\"endDate\":\"2022-06-21 19:21:00\",\"materialNo\":\"100300266\",\"qty\":76,\"stationCount\":1,\"overFlag\":0,\"prepareIncrement\":0,\"wemng\":50,\"docType\":1,\"replenishmentNo\":null}]},\"message\":null}";
+        String jsonStr = "[{\"baseCode\":\"8001\",\"endDate\":\"2022-07-05 00:15:54\",\"jobNo\":\"2022070500001\",\"lgort\":\"M9142\",\"materialNo\":\"100000001\",\"overFlag\":0,\"prepareIncrement\":3,\"qty\":40,\"startDate\":\"2022-07-05 00:00:00\",\"station\":\"2_10010_L_NPM-1\",\"stationCount\":1,\"subWknum\":\"1001583301_1,1001583401_1\",\"wemng\":40,\"workLine\":\"TP03\"},{\"baseCode\":\"8001\",\"endDate\":\"2022-07-05 00:18:04\",\"jobNo\":\"2022070500001\",\"lgort\":\"M9142\",\"materialNo\":\"100000002\",\"overFlag\":0,\"prepareIncrement\":5,\"qty\":40,\"startDate\":\"2022-07-05 00:01:52\",\"station\":\"2_10011_R_NPM-2\",\"stationCount\":1,\"subWknum\":\"1001583301_2,1001583401_2\",\"wemng\":40,\"workLine\":\"TP03\"},{\"baseCode\":\"8001\",\"endDate\":\"2022-07-05 00:18:04\",\"jobNo\":\"2022070500001\",\"lgort\":\"M9142\",\"materialNo\":\"100100396\",\"overFlag\":0,\"prepareIncrement\":0,\"qty\":40,\"startDate\":\"2022-07-05 00:01:52\",\"station\":\"1_10010_R_NPM-1\",\"stationCount\":1,\"subWknum\":\"1001583301_2,1001583401_2\",\"wemng\":40,\"workLine\":\"TP03\"},{\"baseCode\":\"8001\",\"endDate\":\"2022-07-05 00:15:54\",\"jobNo\":\"2022070500001\",\"lgort\":\"M9142\",\"materialNo\":\"190800072\",\"overFlag\":0,\"prepareIncrement\":0,\"qty\":40,\"startDate\":\"2022-07-05 00:00:00\",\"station\":\"1_10010_L_NPM-2\",\"stationCount\":1,\"subWknum\":\"1001583301_1,1001583401_1\",\"wemng\":40,\"workLine\":\"TP03\"}]";
 
         String dataStr = "";
         //转成map，只取里面的data
@@ -103,7 +103,7 @@ public class JsonUtil {
 
         //responseInfo.getData()
 
-        List<HikOrderInfo> list = JsonUtil.toList(responseInfo.getDataStr(),   HikOrderInfo .class);
+        List<HikOrderInfo> list = JsonUtil.toList(jsonStr,   HikOrderInfo .class);
         for (HikOrderInfo info : list) {
             System.out.println(info.getMaterialNo());
         }