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

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

@@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @Modify:
  **/
 public class WmsEnumUtil {
+
     /**
      * 拆分规则
      */
@@ -957,6 +958,40 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 库存条码表条码质量状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SN_QUALITY_STATUS {
+        NORMAL(10, "合格"), ABNORMAL(20, "不合格"), ISOLATED(30, "隔离");
+
+        private int value;
+        private String description;
+
+        SN_QUALITY_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;
+        }
+    }
+
+    /**
      * 业务表：库存条码状态
      * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
      */
@@ -968,7 +1003,7 @@ public class WmsEnumUtil {
         INSTOCKED(30, "入库"),
         PICKED(40, "配料"),
         OUT_STOCK(50, "出库"),
-        SCRAPED(60, "报废"),
+        FRAZE(60, "报废"),
         COMMING(70, "在途");
 
         private int value;
@@ -1239,6 +1274,41 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 库存移动单明细状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MOVE_DETAIL_STATUS {
+        CREATE(10, "创建"),
+        BE_HANDLE(20, "待处理"),
+        FINISH(30, "已处理");
+
+        private int value;
+        private String description;
+
+        MOVE_DETAIL_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;
+        }
+    }
 
     /**
      * 质检业务类型
@@ -1846,6 +1916,16 @@ public class WmsEnumUtil {
             return code;
         }
 
+        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;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -1882,5 +1962,97 @@ public class WmsEnumUtil {
         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;
+        }
+    }
+
+    /**
+     * 库存交易记录生成标记
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRANS_QUAN_GENERAL_TAG {
+        MINUS(-1, "MINUS", "一条：负"), ZERO(0, "ZERO", "一条：0"), PLUS(1, "PLUS", "一条：正"), TWO(2, "TWO", "两条：一正一负");
+
+        private String code;
+        private String description;
+        int value;
+
+        TRANS_QUAN_GENERAL_TAG(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static TRANS_QUAN_GENERAL_TAG codeOf(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * 数据状态
+     *  1 启用
+     *  2 禁用
+     *  3 全部
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_STATUS {
+        ENABLE(1, "启用"),
+        DISABLE(2, "禁用"),
+        LOCKING(3, "全部");
+
+        private int value;
+        private String description;
+
+        DATA_STATUS() {
+        }
+
+        DATA_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+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;
+
+/**
+ * @Description : 条码解析规则
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-03-12 14:45
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_BARCODE_RULE")
+@Api(value="条码规则",description = "条码规则")
+public class SysBarcodeRule extends BaseBean {
+
+    @Column(name = "NAME")
+    @ApiParam(value = "规则名称")
+    private String name;
+
+    @Column(name = "BARCODE_RULE_CODE")
+    @ApiParam(value = "规则代码")
+    private String barcodeRuleCode;
+
+    @Column(name = "BARCODE_RULE")
+    @ApiParam(value = "条码规则")
+    private String barcodeRule;
+
+    @Column(name = "BARCODE_SEPARATOR")
+    @ApiParam(value = "条码分隔符")
+    private String barcodeSeparator;
+
+    @Column(name="BARCODE_RULE_DESCRIPTION")
+    @ApiParam(value ="条码规则描述")
+    private String barcodeRuleDescription;
+
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java

@@ -41,7 +41,7 @@ public class SysOrderNoRule extends BaseBean {
     @ApiParam(value = "规则代码")
     private String orderNoRuleCode;
 
-    @Column(name = "numberRule")
+    @Column(name = "ORDER_NO_RULE")
     @ApiParam(value = "单号规则")
     private String orderNoRule;
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysBarcodeRuleRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule;
+
+/**
+ * @Description : 条码规则
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-03-12 16:02
+ * @Modify:
+ **/
+public interface SysBarcodeRuleRepository extends BaseRepository<SysBarcodeRule, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -635,4 +635,34 @@ public class CoreHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 条码规则代码是否存在
+     * @param sysBarcodeRule
+     * @return
+     */
+    public static String packHqlSysBarcodeRuleCode(SysBarcodeRule sysBarcodeRule){
+        StringBuffer result =  new StringBuffer();
+
+        // and
+        HqlPack.getStringEqualPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result);
+        // not
+        HqlPack.getNumNOEqualPack(sysBarcodeRule.getId(),"id",result);
+
+        return result.toString();
+    }
+
+    /**
+     * 条码规则复杂查询
+     * @param sysBarcodeRule
+     * @return
+     */
+    public static String packHqlSysBarcodeRule(SysBarcodeRule sysBarcodeRule){
+        StringBuffer result =  new StringBuffer();
+
+        HqlPack.getStringLikerPack(sysBarcodeRule.getName(),"name",result);
+        HqlPack.getStringLikerPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result);
+
+        return result.toString();
+    }
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java

@@ -165,4 +165,20 @@ public class ReportHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 元素名称是否存在
+     * @param brElement
+     * @return
+     */
+    public static String packHqlBrElementName(BrElement brElement){
+        StringBuffer result =  new StringBuffer();
+
+        // and
+        HqlPack.getStringEqualPack(brElement.getElementName(),"elementName",result);
+        // not
+        HqlPack.getNumNOEqualPack(brElement.getId(),"id",result);
+
+        return result.toString();
+    }
 }

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

@@ -43,4 +43,8 @@ public class WmsActionModule extends BaseBean {
     @Column(name="AM_TYPE")
     @ApiParam(value = "组件类型", example = "0")
     public Integer amType;
+
+    @Column(name="OP_TYPE_CODE")
+    @ApiParam(value = "作业类型", example = "0")
+    public Integer opTypeCode;
 }

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

@@ -63,7 +63,7 @@ public class WmsCheckFactRecord extends BaseBean {
 
     @Column(name="REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     @Column(name="PLAN_QTY")
     @ApiParam(value = "应收数量", example = "0")

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

@@ -82,18 +82,6 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "ERP单号")
     private String erpSrcNo;
 
-    @Column(name = "PART_NO")
-    @ApiParam(value = "物料编码")
-    private String partNo;
-
-    @Column(name = "PART_NAME")
-    @ApiParam(value = "物料名称")
-    private String partNameRdd;
-
-    @Column(name = "QTY")
-    @ApiParam(value = "数量", example = "1")
-    private Double qty;
-
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
     public Integer isTask;
@@ -101,8 +89,4 @@ public class WmsDocMovementMaster extends BaseBean {
     @Column(name = "PRIORITY")
     @ApiParam(value = "优先级", example = "1")
     public Integer priority;
-
-    @Transient
-    @ApiParam(value = "移库单明细集合")
-    private List<WmsDocMovementDetails> wmsDocMovementDetailsList;
 }

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

@@ -62,7 +62,7 @@ public class WmsMoveSn extends BaseBean {
 
     @Column(name="REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     @Column(name="LOT_NO")
     @ApiParam("批次编号")
@@ -132,6 +132,14 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam(value = "目的条码状态", example = "1")
     public Integer destSnStatus;
 
+    @Column(name="DATE_CODE")
+    @ApiParam("生产日期")
+    public String dateCode;
+
+    @Column(name="FIX_LOT_NO")
+    @ApiParam("特殊批次")
+    public String fixLotNo;
+
     public WmsMoveSn(){}
 
     public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){

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

@@ -61,7 +61,7 @@ public class WmsQCDetails extends BaseBean {
 
     @Column(name = "REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
 
     @Column(name = "FACT_QTY")

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

@@ -50,7 +50,7 @@ public class WmsQCMaster extends BaseBean {
 
     @Column(name = "REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     @Column(name = "CUSTOMER_NO")
     @ApiParam("客户编号")

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

@@ -52,6 +52,10 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam("单位")
     public String unit;
 
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编码")
+    private String custNo;
+
     @Column(name = "QTY")
     @ApiParam(value = "可用数量", example = "0")
     public Double qty;

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

@@ -46,7 +46,7 @@ public class WmsTaskInfo extends BaseBean {
 
     @Column(name = "REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     /**
      * 状态:1=创建,10=待处理,20=已处理

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

@@ -45,11 +45,11 @@ public class WmsTransQuan extends BaseBean {
     private String locateNo;
 
     @Column(name = "PART_NO")
-    @ApiParam(value = "零件编号")
+    @ApiParam(value = "物料编码")
     private String partNo;
 
     @Column(name = "PART_NAME_RDD")
-    @ApiParam(value = "零件名称")
+    @ApiParam(value = "物料名称")
     private String partNameRdd;
 
     @Column(name = "UNIT")
@@ -95,4 +95,8 @@ public class WmsTransQuan extends BaseBean {
     @Column(name = "CUST_NO")
     @ApiParam(value = "客户编号")
     private String custNo;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam(value = "错误信息")
+    private String errorMessage;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.util.List;
+
+/**
+ * @Description : 单据Model
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-03-07 19:18
+ * @Modify:
+ **/
+@Data
+@Api("数据权限Model")
+public class WmsDataAuthModel extends BaseBean {
+
+    @ApiParam("角色编号")
+    private String roleCode;
+
+    @ApiParam("数据对象")
+    private String dataObj;
+
+    @ApiParam("数据对象值")
+    private String dataObjValue;
+
+    @ApiParam("物料列表")
+    private List<String> partList;
+
+    @ApiParam("库位列表")
+    private List<String> locateList;
+
+    @ApiParam("仓库列表")
+    private List<String> whList;
+
+    @ApiParam("存储区列表")
+    private List<String> zoneList;
+
+    @ApiParam(
+            value = "新增操作",
+            example = "0"
+    )
+    private Integer addOp;
+
+    @ApiParam(
+            value = "删除操作",
+            example = "0"
+    )
+    private Integer delOp;
+
+    @ApiParam(
+            value = "修改操作",
+            example = "0"
+    )
+    private Integer updOp;
+
+    @ApiParam(
+            value = "查询操作",
+            example = "0"
+    )
+    private Integer queryOp;
+}

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

@@ -645,7 +645,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
-        HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result);
         HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result);
 
         getStringBuilderPack(wmsTaskInfo, result);
@@ -1400,4 +1400,27 @@ public class WmsHqlPack {
         getStringBuilderPack(bean, result);
         return result.toString();
     }
+
+    /**
+     * 根据条件查询dataAuth
+     * @param wmsDataAuth
+     * @return
+     */
+    public static String packHqlWmsDataAuthFind(WmsDataAuth wmsDataAuth) {
+        StringBuffer result = new StringBuffer();
+        if (!Strings.isNullOrEmpty(wmsDataAuth.getOrganizeCode())){
+            HqlPack.getStringEqualPack(wmsDataAuth.getOrganizeCode(),"organizeCode",result);
+        }
+        if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())){
+            HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(),"roleCode",result);
+        }
+        if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())){
+            HqlPack.getStringEqualPack(wmsDataAuth.getDataObj(),"dataObj",result);
+        }
+        if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())){
+            HqlPack.getStringLikerPack(wmsDataAuth.getDataObjValue(),"dataObjValue",result);
+        }
+        getStringBuilderPack(wmsDataAuth, result);
+        return result.toString();
+    }
 }