yun-zuoyi
joke.wang 5 years ago
commit ce1dd45842

@ -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, "星期一"),
TUESDAY(20, "星期二"),
WEDNESDAY(30, "星期三"),
THURSDAY(40, "星期四"),
FRIDAY(50, "星期五"),
SATURDAY(60, "星期六"),
SUNDAY(70, "星期七");
private int value;
private String description;
MONDAY(20, "星期一"),
TUESDAY(30, "星期二"),
WEDNESDAY(40, "星期三"),
THURSDAY(50, "星期四"),
FRIDAY(60, "星期五"),
SATURDAY(70, "星期六"),
SUNDAY(10, "星期日");
private final int value;
private final String description;
WEEK_TYPE(int value, String description) {
this.value = value;

@ -0,0 +1,28 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2020-04-22 19:46
* @Modify:
**/
@Data
public class WmsMoveDetailsBySnModel implements Serializable {
private static final long serialVersionUID = -3023644672955363786L;
@ApiParam("明细数据")
private List<WmsDocMovementDetails> detailsList;
@ApiParam("分页")
private Pager pager;
}

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.wms.bean.WmsPoSn;
import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -22,4 +23,7 @@ public class WmsPoSnPrintModel implements Serializable {
@ApiParam("打印条码")
private List<WmsStockSn> wmsStockSnList;
@ApiParam("单据条码")
private List<WmsPoSn> wmsPoSnList;
}

@ -18,7 +18,7 @@ import javax.persistence.*;
import java.io.Serializable;
/**
* @Description : BOM
* @Description : QAD_BOP
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2020-01-09 14:40
@ -29,7 +29,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@Table(name="QAD_BOP")
@Api("包材BOM信息")
@Api("QAD_BOP信息")
public class QadBop implements Serializable {
private static final long serialVersionUID = 4673217061075875734L;

@ -0,0 +1,97 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description : SOD_DET
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2020-04-22 16:12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name="SOD_DET")
@Api("SOD_DET信息")
public class SodDet implements Serializable {
private static final long serialVersionUID = 539607553249262854L;
@Id
@GeneratedValue(generator = "IDGenerator")
@GenericGenerator(name = "IDGenerator", strategy = "assigned")
@Column(name="ID")
@ApiParam(value = "主键",example = "0")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
public Long id;
//get单独处理
public Long getId() {
if(id != null) {
return id.longValue();
}else{
return id;
}
}
/**
* MonogoDB _id
* @param id
*/
@JSONField(name="_id")
public void setId(Long id) {
this.id = id;
}
@Column(name="COLUMN_GROUP")
@ApiParam("分组列名")
public String columnGroup;
@Column(name="COLUMN_GROUP_VALUE")
@ApiParam("分组列名值")
public String columnGroupValue;
@Column(name="PROPERTIES_NAME")
@ApiParam("参数名")
public String propertiesName;
@Column(name="PROPERTIES_VALUE")
@ApiParam("参数值")
public String propertiesValue;
@Column(name="table_name")
@ApiParam("表名")
public String tableName;
@Transient
private String dockcode;
@Transient
private String storagelocation;
@Transient
private String requerimentCode;
}

@ -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;

@ -138,4 +138,16 @@ public class WmsDocFgDetail extends BaseBean {
@ApiParam(value = "BOM生效日期")
@Column(name = "EFF_START_TIME")
private String effStartTime;
@Column(name = "SHIFT_CODE")
@ApiParam("班次代码")
private String shiftCode;
@Column(name = "ACTUAL_REPORT_LINE")
@ApiParam("实际报工产线")
private String actualReportLine;
@Column(name = "BATCH_NO")
@ApiParam("批号")
private String batchNo;
}

@ -11,8 +11,12 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.util.Objects;
import javax.persistence.Column;
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=
*/
@ -245,6 +256,14 @@ public class WmsDocMovementDetails extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description")
private Integer executeStatus;
@Transient
@ApiParam(value = "客户发往地编号")
private String flagNo;
@Transient
@ApiParam("执行")
private Integer isMakeUp;
public String getRecommondLot() {
return recommondLot == null ? "无" : this.recommondLot;
}

@ -127,7 +127,6 @@ public class WmsDocMovementSn extends BaseBean {
@ApiParam("父层级packcode对应的可回用零件号")
private String parentReturnPart;
@Transient
@ApiParam("打印模板")
private String templateNo;
@ -136,6 +135,15 @@ public class WmsDocMovementSn extends BaseBean {
@ApiParam("剩余箱数量")
private Long countBox;
@Transient
private String dockcode;
@Transient
private String storagelocation;
@Transient
private String requerimentCode;
public WmsDocMovementSn(){}
public WmsDocMovementSn(Long countBox,String partNo) {

@ -340,6 +340,15 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "箱数")
private Long boxQtys;
@Transient
private String dockcode;
@Transient
private String storagelocation;
@Transient
private String requerimentCode;
public WmsStockSn() {
}

@ -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;
}

@ -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() {
}
}

@ -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;
}
}

@ -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;
}
}

@ -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() {
}
}

@ -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

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.QadBop;
import org.springframework.stereotype.Repository;
/**
* @Description :
@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.QadBop;
* @CreateDate : 2020-01-09 15:06
* @Modify:
**/
@Repository
public interface QadBopRepository extends BaseRepository<QadBop, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.QadBop;
import cn.estsh.i3plus.pojo.wms.bean.SodDet;
import org.springframework.stereotype.Repository;
/**
* @Description : SOD_DET
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2020-01-09 15:06
* @Modify:
**/
@Repository
public interface SodDetRepository extends BaseRepository<SodDet, Long> {
}
Loading…
Cancel
Save