1

ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java

@@ -24,7 +24,7 @@ import com.ruoyi.common.utils.StringUtils;
 
 /**
  * 通用http发送方法
- * 
+ *
  * @author ruoyi
  */
 public class HttpUtils
@@ -138,7 +138,7 @@ public class HttpUtils
             conn.setRequestProperty("connection", "Keep-Alive");
             conn.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)");
             conn.setRequestProperty("Accept-Charset", "utf-8");
-            conn.setRequestProperty("contentType", "utf-8");
+            conn.setRequestProperty("contentType", "application/json");
             conn.setDoOutput(true);
             conn.setDoInput(true);
             out = new PrintWriter(conn.getOutputStream());
@@ -271,4 +271,4 @@ public class HttpUtils
             return true;
         }
     }
-}
+}

ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsCommonRes.java

@@ -11,7 +11,7 @@ public class WcsCommonRes {
     /**
      * message
      */
-    private String message;
+    private String msg;
     /**
      * data
      */
@@ -25,12 +25,12 @@ public class WcsCommonRes {
         this.code = code;
     }
 
-    public String getMessage() {
-        return message;
+    public String getMsg() {
+        return msg;
     }
 
-    public void setMessage(String message) {
-        this.message = message;
+    public void setMsg(String message) {
+        this.msg = message;
     }
 
     public Object getData() {

ruoyi-system/src/main/java/com/ruoyi/app/domain/AppTaskBak.java

@@ -76,6 +76,27 @@ public class AppTaskBak extends BaseEntity
     /** PLC任务号 */
     @Excel(name = "PLC任务号")
     private Long plcId;
+    @Excel(name = "库位号")
+    private String locationId;
+
+    //1.零捡 2：全量
+    private Integer ckType;
+
+    public String getLocationId() {
+        return locationId;
+    }
+
+    public void setLocationId(String locationId) {
+        this.locationId = locationId;
+    }
+
+    public Integer getCkType() {
+        return ckType;
+    }
+
+    public void setCkType(Integer ckType) {
+        this.ckType = ckType;
+    }
 
     public Long getPlcId() {
         return plcId;