Merge remote-tracking branch 'origin/master'

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.base.bean;
+
+/**
+ * @Description : 基础fallback类，用于处理熔断
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-11-22 18:47
+ * @Modify:
+ **/
+public class BaseFallBackBean {
+
+    public BaseResultBean makeBaseFallBack(){
+        return makeBaseFallBack("服务暂停");
+    }
+
+    public BaseResultBean makeBaseFallBack(String msg){
+        return BaseResultBean.buildBaseResultBean(false,msg);
+    }
+}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java

@@ -95,7 +95,6 @@ public class BaseResultBean<Obj> {
         return totalCount;
     }
 
-
     public static BaseResultBean buildBaseResultBean(boolean success,String msg){
         BaseResultBean rs =  new BaseResultBean();
         rs.success = success;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -20,9 +20,10 @@ public class CommonEnumUtil {
         CORE(2, "i3core", "i3业务平台"),
         WMS(3, "i3wms", "仓库管理软件"),
         MES(4, "i3mes", "生产管理软件"),
+        GATEWAY(96,"impp-gateway","服务网关"),
         CLOUD(97,"i3cloud","微服务"),
         SURFACE(98,"i3surface","对外服务"),
-        CENTER(99,"icloud-server","云服务中心");
+        CENTER(99,"icloud-server","注册中心");
 
         public int value;
         public String code;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -49,9 +49,9 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ORDER_DETAILS_STATUS {
-        NORMAL(10, "N", "正常"),
-        ANCEL(20, "C", "行取消"),
-        RECEIPTED(30, "R", "已收货");
+        NORMAL(1, "N", "正常"),
+        ANCEL(10, "C", "行取消"),
+        RECEIPTED(20, "R", "已收货");
 
         private int value;
         private String code;
@@ -1573,4 +1573,41 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * PO条码表条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PO_SN_STATUS {
+
+        fOUND(10, "创建"),
+        PRINTED(20, "已打印"),
+        RECEIPTED(30, "已收货");
+
+        private int value;
+        private String description;
+
+        PO_SN_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+/**
+ * @Description : 流程管家模型
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-28 15:50
+ * @Modify:
+ **/
+@Data
+public class ActionButlerModel {
+
+    private String orderNo;
+
+    private String sn;
+
+    private String aLId;
+
+    private String userNo;
+
+    private String fixNo;
+
+    private String barCode;
+
+    private String funCallName;
+}

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

@@ -2,7 +2,9 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 import java.util.Map;
@@ -15,6 +17,8 @@ import java.util.Map;
  * @Modify:
  **/
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 @Api("返回前端数据实体")
 public class WmsActionResponseBean {
 
@@ -40,5 +44,18 @@ public class WmsActionResponseBean {
     public List<Map<String, Object>> details;
 
     @ApiParam(value = "结果代码")
-    public Boolean codeStatus;
+    public boolean codeStatus;
+
+    public WmsActionResponseBean(boolean codeStatus, String message) {
+        this.codeStatus = codeStatus;
+        this.message = message;
+    }
+
+    public WmsActionResponseBean(Double percent, String message, List<String> informations,  List<Map<String, Object>> details, Boolean codeStatus) {
+        this.percent = percent;
+        this.message = message;
+        this.informations = informations;
+        this.details = details;
+        this.codeStatus = codeStatus;
+    }
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -16,7 +17,7 @@ import java.util.Map;
  **/
 @Data
 @Api("接受前端数据实体")
-public class WmsOperationBean {
+public class WmsOperationBean extends BaseBean {
 
     @ApiParam("扫描内容")
     public String barCode;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.java

@@ -13,4 +13,6 @@ import org.springframework.stereotype.Repository;
  **/
 @Repository
 public interface WmsASNMasterDetailsRepository extends BaseRepository<WmsASNMasterDetails, Long> {
+
+
 }

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

@@ -1156,6 +1156,4 @@ public class WmsHqlPack {
 
         return  result.toString();
     }
-
-
 }