commit

PddServer/src/main/java/org/ta/pddserver/controller/PddLocalController.java

@@ -294,7 +294,7 @@ public class PddLocalController {
             //全部入库
             logOrderEntity.setStatus(StatusEnum.FULLINBOUND.getCode());
         }else {
-            logOrderEntity.setStatus(StatusEnum.FULLINBOUND.getCode());
+            logOrderEntity.setStatus(StatusEnum.PARTINBOUND.getCode());
         }
 
         logOrderImpl.updateById(logOrderEntity);
@@ -404,16 +404,14 @@ public class PddLocalController {
         notifyRequest.setBizAction(action);
         notifyRequest.setExecuteTime(timeTool.getNowDate());
         notifyRequest.setTimeZone("UTC+8");
+        notifyRequest.setBizActionDesc("开始拣货");
 
+        notifyRequest.setResult(new PddServiceConsoCoBizActionNotifyRequest.Result());
 
-        PddServiceConsoCoBizActionNotifyRequest.Result notifyResult = new PddServiceConsoCoBizActionNotifyRequest.Result();
-        notifyRequest.setBizActionDesc("开始拣货");
         notifyRequest.getResult().setCode(inBoundRequest.getCode());
         notifyRequest.getResult().setDesc(ErrorEnum.getByCode(inBoundRequest.getCode()).getDesc());
         notifyRequest.getResult().setRemark(ErrorEnum.getByCode(inBoundRequest.getCode()).getDesc());
 
-        notifyRequest.setResult(notifyResult);
-
 
         log.info("derelictionRequest:{}", JSON.toJSONString(notifyRequest));
         JYBaseRequestModel requestModel = new JYBaseRequestModel();

PddServer/src/main/java/org/ta/pddserver/model/api/request/CollectOrderListRequest.java

@@ -7,4 +7,6 @@ import org.ta.pddserver.model.common.PageTool;
 public class CollectOrderListRequest extends PageTool {
 
     private String orderCode;
+
+    private int status;
 }

PddServer/src/main/java/org/ta/pddserver/model/api/request/InBoundRequest.java

@@ -25,7 +25,7 @@ public class InBoundRequest {
 
     private String action;
 
-    private int code;
+    private Integer code;
 
     private String goodsType;
 }

PddServer/src/main/java/org/ta/pddserver/model/enums/StatusEnum.java

@@ -9,7 +9,7 @@ public enum StatusEnum {
     INBOUND(20, "入库"),
     PARTINBOUND(21, "部分入库"),
     FULLINBOUND(22, "全部入库"),
-    BOUNDERROR(22, "入库异常"),
+    BOUNDERROR(23, "入库异常"),
     UNPACK(30, "通知拆包"),
     UNPACKBEGINPICK(31, "开始拣货"),
     UNPACKFINISHPICK(32, "拣货完成"),