【657】【中航WMS看板－成品发运率看板】

【658】【中航WMS看板－发运窗口时间看板】
【656】【 中航WMS看板－收货完成率看板】
【655】【 中航WMS看板－仓库预警看板】
【654】【中航WMS看板－３０天供应商延期到货跟踪动态看板】

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

@@ -304,6 +304,7 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ORDER_DETAILS_STATUS {
         CREATE(10, "CREATE", "创建"),
+        PROCESSING(50, "PROCESSING", "发运中"),
         RECEIPTED(20, "FINISHED", "已完成"),
         CANCEL(30, "CANCLE", "行取消"),
         PRINTED(40, "PRINTED", "已打印");
@@ -6095,16 +6096,16 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WEEK_TYPE {
-        MONDAY(10, "星期一"),
+        MONDAY(20, "星期一"),
-        TUESDAY(20, "星期二"),
+        TUESDAY(30, "星期二"),
-        WEDNESDAY(30, "星期三"),
+        WEDNESDAY(40, "星期三"),
-        THURSDAY(40, "星期四"),
+        THURSDAY(50, "星期四"),
-        FRIDAY(50, "星期五"),
+        FRIDAY(60, "星期五"),
-        SATURDAY(60, "星期六"),
+        SATURDAY(70, "星期六"),
-        SUNDAY(70, "星期七");
+        SUNDAY(10, "星期日");
-
+
-        private int value;
+        private final int value;
-        private String description;
+        private final String description;
 
         WEEK_TYPE(int value, String description) {
             this.value = value;

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -38,6 +40,7 @@ public class WmsCustWindow extends BaseBean {
     private String custWindowTime;
 
     @Column(name = "WEEKS")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.WEEK_TYPE.class, refForeignKey = "value", value = "description")
     @ApiParam(value = "星期")
     private String weeks;
 

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

@@ -11,8 +11,12 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
-import java.util.Objects;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 /**
  * @Description :移库单明细实体(用于转储类业务)
@@ -108,6 +112,13 @@ public class WmsDocMovementDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
     private Integer itemStatus;
 
+
+    /**
+     * 已创建，已收货，已发运，已拣货
+     */
+    @Transient
+    @ApiParam(value = "状态中文")
+    private String itemStatusStr;
     /**
      * 是否免费:0=计费,1=免费
      */

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+/**
+ * @Description :窗口输出类
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-04-21 2:37 下午
+ * @Modify:
+ **/
+@Entity
+@Data
+@Api("窗口输出类")
+public class WmsCustWindowDto {
+
+    @Id
+    @GeneratedValue(generator = "IDGenerator")
+    @GenericGenerator(name = "IDGenerator", strategy = "assigned")
+    @Column(name = "ID")
+    @ApiParam(value = "主键", example = "0")
+    public Long id;
+
+
+    @ApiParam(value = "窗口时间")
+    private String custWindowTime;
+
+    @ApiParam(value = "星期一客户")
+    private String mondayCust;
+
+    @ApiParam(value = "星期二客户")
+    private String tuesdayCust;
+
+    @ApiParam(value = "星期三客户")
+    private String wednesdayCust;
+
+    @ApiParam(value = "星期四客户")
+    private String thursdayCust;
+
+    @ApiParam(value = "星期五客户")
+    private String fridayCust;
+
+    @ApiParam(value = "星期六客户")
+    private String saturdayCust;
+
+    @ApiParam(value = "星期日客户")
+    private String sundayCust;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+/**
+ * @Description :移动单效率(出参)
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-04-10 3:21 下午
+ * @Modify:
+ **/
+@Data
+@Entity
+@Api("移动单效率(出参)")
+public class WmsMoveMovementEffectivenessDto {
+
+    @Id
+    @GeneratedValue(generator = "IDGenerator")
+    @GenericGenerator(name = "IDGenerator", strategy = "assigned")
+    @Column(name = "ID")
+    @ApiParam(value = "主键", example = "0")
+    public Long id;
+
+    @ApiParam(value = "日期")
+    private String date;
+
+    @ApiParam(value = "比列")
+    private Double percentage;
+
+    public WmsMoveMovementEffectivenessDto(String date, Double percentage) {
+        this.date = date;
+        this.percentage = percentage;
+    }
+
+    public WmsMoveMovementEffectivenessDto() {
+    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java

@@ -0,0 +1,75 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+/**
+ * @Description :装车单打印输出model(出参)
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-04-10 3:21 下午
+ * @Modify:
+ **/
+@Data
+@Entity
+@Api("静态盘点查询输出实体类")
+public class WmsStockSnDto {
+
+    @Id
+    @GeneratedValue(generator = "IDGenerator")
+    @GenericGenerator(name = "IDGenerator", strategy = "assigned")
+    @Column(name = "ID")
+    @ApiParam(value = "主键", example = "0")
+    public Long id;
+
+    @ApiParam(value = "库位")
+    private String locateNo;
+    @ApiParam(value = "物料号")
+    private String partNo;
+    @ApiParam(value = "物料名称")
+    private String partNameRdd;
+    @ApiParam(value = "数量")
+    private Double qty;
+    @ApiParam(value = "生产批次")
+    private String dateCode;
+
+    @ApiParam(value = "规格")
+    private String partSpec;
+
+    @ApiParam(value = "存储区")
+    private String zoneNo;
+
+    public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode) {
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.dateCode = dateCode;
+    }
+
+    public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode, String partSpec) {
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.dateCode = dateCode;
+        this.partSpec = partSpec;
+    }
+
+    public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode, String partSpec, String zoneNo) {
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.dateCode = dateCode;
+        this.partSpec = partSpec;
+        this.zoneNo = zoneNo;
+    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :供应商延期输出实体类(出参)
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-04-10 3:21 下午
+ * @Modify:
+ **/
+@Data
+@Api("供应商延期输出实体类")
+public class WmsSupplierExtensionDto {
+
+    @ApiParam(value = "序号")
+    private Integer rn;
+
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @ApiParam(value = "数量")
+    private Integer num;
+
+    public WmsSupplierExtensionDto() {
+
+    }
+
+    public WmsSupplierExtensionDto(String vendorNo, Integer num) {
+        this.vendorNo = vendorNo;
+        this.num = num;
+    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsWarehouseWarningDto.java

@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 中航WMS看板－仓库预警看板(出参)
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-04-10 3:21 下午
+ * @Modify:
+ **/
+@Data
+@Api("中航WMS看板－仓库预警看板(出参)")
+public class WmsWarehouseWarningDto {
+
+    @ApiParam(value = "零件号")
+    private String partNo;
+
+    @ApiParam(value = "存储区")
+    private String zoneNo;
+
+    @ApiParam(value = "零件号名称")
+    private String partNameRdd;
+
+    @ApiParam(value = "库存")
+    private Double qty;
+
+    @ApiParam(value = "最大库存")
+    private Double maxqty;
+
+    @ApiParam(value = "最小库存")
+    private Double minqty;
+
+    @ApiParam(value = "库存状态")
+    private String stockStatus;
+
+    @ApiParam(value = "库位")
+    private String locateNo;
+
+    @ApiParam(value = "颜色")
+    private String color;
+
+    public WmsWarehouseWarningDto(String partNo, String zoneNo, String partNameRdd, Double qty, Double maxqty,
+                                  Double minqty, String stockStatus, String locateNo, String color) {
+        this.partNo = partNo;
+        this.zoneNo = zoneNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.maxqty = maxqty;
+        this.minqty = minqty;
+        this.stockStatus = stockStatus;
+        this.locateNo = locateNo;
+        this.color = color;
+    }
+
+    public WmsWarehouseWarningDto() {
+
+    }
+
+}

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

@@ -10,7 +10,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @Description :装车单打印输出model
+ * @Description :装车单打印输出model(出参)
  * @Reference :
  * @Author :QianHuaSheng
  * @CreateDate : 2020-04-10 3:21 下午