Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import java.util.List;
+
+/**
+ * @Description : PDA传输到后台的实体bean对象
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-22 15:58
+ * @Modify:
+ **/
+@Data
+@Api("返回前端数据实体")
+public class WmsActionResponseBean extends BaseBean {
+
+    @ApiParam("进度")
+    public Double percent;
+
+    @ApiParam("当前步骤")
+    public Integer currentStep;
+
+    @ApiParam("总步数")
+    public int totalStep;
+
+    @ApiParam("提示信息")
+    public String message;
+
+    @ApiParam("列表信息")
+    public List<String> informations;
+
+    @ApiParam("可选项")
+    public List<String> options;
+
+    @ApiParam("选中的明细数据")
+    public String details;
+
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java

@@ -49,6 +49,15 @@ public class WmsActionStep extends BaseBean {
     private String atNameCRdd;
 
     @Column(name = "AT_ID")
-    @ApiParam(value = "步骤类型编号")
+    @ApiParam(value = "步骤类型编号", example = "0")
-    private String atId;
+    private Long atId;
+
+    //get单独处理
+    public Long getAtId() {
+        if(atId != null) {
+            return atId.longValue();
+        }else{
+            return atId;
+        }
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.List;
+
+/**
+ * @Description : PDA传输到后台的实体bean对象
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-22 15:58
+ * @Modify:
+ **/
+@Data
+@Api("接受前端数据实体")
+public class WmsOperationBean extends BaseBean {
+
+    @ApiParam("扫描内容")
+    public String barCode;
+
+    @ApiParam("可选项的值")
+    public List<String> options;
+
+    /**
+     * 触发源:10=扫描枪,
+     * 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除)
+     * 60=明细（清空）
+     */
+    @ApiParam("触发源")
+    public int sourceOwner;
+
+    @ApiParam("选中的明细数据")
+    public String details;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -470,7 +470,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //发运单号
-        HqlPack.getStringEqualPack(wmsShopping.getOrderNo(), "orderNo", result);
+        HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result);
         //客户编码
         HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result);
         //物料编码