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

6 years ago · ed7857b86d
parent b667d6840e d6dba36f0e
commit ed7857b86d
9 changed files with 89 additions and 11 deletions
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java
@ -439,7 +439,7 @@ public class BlockReportEnumUtil {
                }else if(type.equals(TEMPLATE_TYPE.ECHARTS_BAR)){       // 饼图  只需要名称 和值
                    return new String[]{"name","value"};
                }else if(type.equals(TEMPLATE_TYPE.ECHARTS_LINE)){       // 饼图  只需要名称 和值
-                    return new String[]{"name","value","xAxis"};
+                    return new String[]{"xAxis","name","value"};
                }else if(type.equals(TEMPLATE_TYPE.ECHARTS_TREEMAP)){       // 饼图  只需要名称 和值
                    return new String[]{"name","value"};
                }
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
@ -1048,8 +1048,6 @@ public class ImppEnumUtil {
        }
    }

-    //messageReceiverType
-
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
    public enum MESSAGE_RECEIVER_TYPE {
        INTERNAL(1, "内部人员接收"),
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@ -300,6 +300,54 @@ public class WmsEnumUtil {
    }

    /**
+     * 收货主表信息 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RC_ORDER_STATUS {
+        CREATE(10, "新建"),
+        RECEIPT(20, "收货中"),
+        RECEIPT_FINISH(30, "收货完成"),
+        CLOSED(40, "已关闭"),
+        CANCELLED(50, "已取消");
+
+        private int value;
+        private String description;
+
+        RC_ORDER_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;
+        }
+
+        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;
+        }
+    }
+
+    /**
     * PO条码状态信息
     */
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -597,14 +645,15 @@ public class WmsEnumUtil {
        ALLOCATION(40, "ALLOCATION", "调拨"),
        SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"),
        SCATTERED_IN(60, "SCATTERED_IN", "零星入库"),
-        NC_WAREHOSING(70, "NC_WAREHOSING", "NC入库"),
+        NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"),
        SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),
        CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"),
        PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"),
        INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"),
        SCRAPPING_OUT(120, "SCRAPPING_OUT", "报废出库"),
        RECEIVING_IN(130, "RECEIVING_IN", "收货入库"),
-        OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回");
+        OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"),
+        NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库");

        private int value;
        private String code;
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java
@ -23,4 +23,10 @@ public class TransSnModle extends BaseComponetsParam{
    @ApiParam(value = "是否分组")
    public int isGroup;

+    @ApiParam(value = "物料")
+    public String partNo;
+
+    @ApiParam(value = "分组编号")
+    public String packageNo;
+
 }
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java
@ -89,6 +89,11 @@ public class BrPojoAttr extends BaseBean {
    @ApiParam(value ="聚合类型",example = "-1")
    private Integer aggregationType;

+    @Column(name="AGGREGATION_ID")
+    @ApiParam(value ="聚合类型",example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long aggregationId;
+
    @Column(name="ATTR_SORT")
    @ApiParam(value ="字段排序")
    private Integer attrSort;
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java
@ -78,10 +78,10 @@ public class ReportHqlPack {
        // 查询参数封装
        HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result);
        if(template.getTemplateStatus() != null &&
-                template.getTemplateStatus().intValue() == BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_FULFIL.getValue()){
+                template.getTemplateStatus().intValue() == BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue()){
            HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",result);
        }else {
-            HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_FULFIL.getValue(),"templateStatus",result);
+            HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result);
        }
        HqlPack.getStringLikerPack(template.getName(),"name",result);

--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@ -97,4 +97,12 @@ public class WmsDocMovementDetails extends WmsOrderDetailsModel {
    @Column(name = "REC_QTY")
    @ApiParam(value = "已收货数量", example = "1")
    private Double recQty;
+
+    @Column(name = "SRC_AREA_NO")
+    @ApiParam("源库存地代码")
+    public String srcAreaNo;
+
+    @Column(name = "DEST_AREA_NO")
+    @ApiParam("目的库存地代码")
+    public String destAreaNo;
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@ -51,7 +51,7 @@ public class WmsStockSn extends BaseBean {
    private String partNameRdd;

    @Column(name = "LOT_NO")
-    @ApiParam("批次编码")
+    @ApiParam("收货日期（批次编码）")
    public String lotNo;

    @Column(name = "DATE_CODE")
@ -98,14 +98,13 @@ public class WmsStockSn extends BaseBean {
    @ApiParam(value = "数量", example = "0")
    private Double qty;
    /**
-     * 1=未质检,10=质检合格,20=质检不合格,30=已退货
+     * 质量状态:10=合格,20=不合格,30=隔离
     */
    @Column(name = "QC_STATUS")
    @ApiParam(value = "质检状态", example = "0")
    private Integer qcStatus;
    /**
-     * :1=创建,10=已收货,20=已质检,30=已入库,40=待出库,50=已出库,
-     * 60=在途,70=已隔离,80=破包,90=冻结,100=作废
+     * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
     */
    @Column(name = "SN_STATUS")
    @ApiParam(value = "条码状态", example = "0")
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@ -1311,6 +1311,19 @@ public class WmsHqlPack {
    }

    /**
+     *  根据条件模糊查询库存条码信息
+     * @param wmsStockSn
+     * @return
+     */
+    public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(wmsStockSn.getSn(),"sn", result);
+        getStringBuilderPack(wmsStockSn, result);
+        HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
+        return result.toString();
+    }
+
+    /**
     *  根据条件查询库存信息
     * @param wmsStockQuan
     * @return