From b688f4aff5e4ca808329a5eede6bd24efbc5ef26 Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Tue, 6 Apr 2021 17:26:52 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=9014905=2020027-=E8=B0=83=E8=A7=92?=
 =?UTF-8?q?=E5=99=A8BH-=E5=BD=95=E5=85=A5=E6=A3=80=E6=B5=8B=E5=80=BC-=20?=
 =?UTF-8?q?=E7=86=94=E6=B7=B1=E7=BB=93=E6=9E=9C=E5=88=B7=E6=96=B0=E6=9C=89?=
 =?UTF-8?q?=E8=AF=AF=20-20210404=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/wms/bean/WmsSerialSnTrans.java     |  4 ++
 .../i3plus/pojo/wms/modelbean/WmsBatchModel.java   | 46 ++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java
index 3c36fe5..ae4fa00 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java
@@ -104,6 +104,10 @@ public class WmsSerialSnTrans extends BaseBean {
     @ApiParam("操作类型")
     private List<Integer> transTypeLst;
 
+    public int getIsOkVal() {
+        return this.isOk == null ? 0 : this.isOk;
+    }
+
     public WmsSerialSnTrans(WmsSerialSn wmsSerialSn, Integer transType) {
         this.organizeCode = wmsSerialSn.getOrganizeCode();
         this.batchNo = wmsSerialSn.getBatchNo();
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java
new file mode 100644
index 0000000..5d6f4d1
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java
@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSn;
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : Batch数据模型
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2021-04-05 14:53
+ * @Modify:
+ **/
+@Data
+@Api("Batch数据模型")
+public class WmsBatchModel {
+
+    @ApiParam("二维条码集合")
+    private List<WmsSerialSn> wmsSerialSns;
+
+    @ApiParam("条码集合")
+    private List<WmsStockSn> wmsStockSnList;
+
+    @ApiParam("Batch号")
+    private String bhCode;
+
+    @ApiParam("上一个熔深Batch号")
+    private String firstSnBatch;
+
+    @ApiParam("新事务单号")
+    private String moveNo;
+
+    @ApiParam("是否正常件")
+    private boolean flag;
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("操作人")
+    private String userName;
+
+}