From 7dddac511318a92f40933bcb7929c17c6cd9d635 Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Mon, 29 Jun 2020 23:03:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=99=BA=E8=83=BD=E5=8C=96=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91-=E9=94=81=E5=AE=9A=E5=BA=93=E4=BD=8D=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java |  8 ++++++++
 .../pojo/wms/modelbean/WmsAutoTaskModel.java       | 22 +++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java
index 10ccc90..153e954 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java
@@ -37,6 +37,14 @@ public class WmsAutoTaskLog extends BaseBean {
     @ApiParam("业务类型")
     public String busiType;
 
+    @Column(name = "STRATEGY_NO")
+    @ApiParam("策略代码")
+    public String strategyNo;
+
+    @Column(name = "STRATEGY_ACTION")
+    @ApiParam("策略动作")
+    public String strategyAction;
+
     @Column(name = "ERROR_MSG")
     @ApiParam("错误信息")
     public String errorMsg;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java
index 13204cf..bbfaa61 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java
@@ -25,6 +25,9 @@ public class WmsAutoTaskModel {
     @ApiParam("存储区")
     private String zoneNo;
 
+    @ApiParam("单据号")
+    private String orderNo;
+
     @ApiParam("物料集合")
     private List<String> partList;
 
@@ -37,6 +40,9 @@ public class WmsAutoTaskModel {
     @ApiParam("锁定库位")
     private String lockLocacte;
 
+    @ApiParam("锁定源库位")
+    private String srcLockLocacte;
+
     @ApiParam("方向")
     private Integer direction;
 
@@ -46,21 +52,27 @@ public class WmsAutoTaskModel {
     @ApiParam("锁定料车")
     private String lockCar;
 
-    @ApiParam("物料对应的明细集合")
+    @ApiParam("预存锁定料车")
+    private String prestoreLockCar;
+
+    @ApiParam("物料对应的单据明细集合")
     private Map<String, WmsDocMovementDetails>  partNoDetailsList;
 
     @ApiParam("锁定物料对应的条码")
-    private Map<String,List<WmsStockSn>> stringListHashMap;
+    private Map<String,List<WmsStockSn>> partNoGroupListMap;
 
     @ApiParam("锁定条码")
     private List<WmsStockSn> lockStockSnList;
 
-    @ApiParam("单据更新状态")
-    private Integer updateOrderStatus;
-
     @ApiParam("任务生成数量")
     private Double taskQty;
 
     @ApiParam("返回错误信息")
     public String errorMsg;
+
+    @ApiParam("策略代码")
+    public String strategyNo;
+
+    @ApiParam("策略动作")
+    public String strategyAction;
 }