Finish Task #2080 Cost:8h

Finish Task #2081 Cost:12h
Finish Task #2083 Cost:8h
yun-zuoyi
qianhs 5 years ago
parent 3173e43245
commit 057439d050

@ -7547,4 +7547,92 @@ public class WmsEnumUtil {
return null;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SCAN_CATEGORY {
ASN(10, "wmsDoMovementMasterRepository", "ASN"),
PO(20, "wmsDoMovementMasterRepository", "PO"),
SO(30, "wmsDoMovementMasterRepository", "SO"),
MOVE(40, "wmsDoMovementMasterRepository", "移库单"),
IN_STOCK(50, "wmsDoMovementMasterRepository", "入库单"),
SHIPPING(60, "wmsDoMovementMasterRepository", "发运单"),
QC(70, "wmsDoMovementMasterRepository", "质检单"),
CS(80, "wmsCSOrderMasterRepository", "盘点单"),
SN(90, "wmsStockSnRepository", "条码"),
PO_SN(100, "wmsPoSnRepository", "收货条码");
private int value;
private String code;
private String description;
SCAN_CATEGORY(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
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 static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
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;
}
public static SCAN_CATEGORY getByDesc(String desc) {
SCAN_CATEGORY tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i];
}
}
return tmp;
}
public static SCAN_CATEGORY codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
}

@ -44,7 +44,7 @@ public class WmsCsStrategy extends BaseBean implements Serializable {
@Column(name = "part_type")
@ApiParam(value = "物料分类")
@AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_ABC")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PART_ABC")
private String partType;
@Column(name = "STRATEGY_TYPE")

@ -1,10 +1,8 @@
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.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -45,8 +43,17 @@ public class WmsModeTransport extends BaseBean {
@Column(name = "TRANSPORT_TYPE")
@ApiParam(value = "运输方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
private Integer transportType;
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, dataSrc = "TRANSPORT_TYPE")
private String transportType;
@Column(name = "SERIAL_NUMBER")
@ApiParam(value = "序号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String serialNumber;
@Column(name = "remake")
@ApiParam(value = "说明")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String remake;
}

@ -1,358 +0,0 @@
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;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.Version;
/**
* @Description :
* @Reference :
* @Author : qianhuasheng
* @CreateDate : 2019-12-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_TMS_SHIPPING_EXT_DETAIL")
@Api("装车单信息明细")
public class WmsTmsShippingExtDetail extends BaseBean {
private static final long serialVersionUID = -4800308354250386102L;
@Column(name="MOVE_NO")
@ApiParam("装车单")
public String moveNo;
@Column(name = "PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name = "ITEM")
@ApiParam("行号")
public String item;
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@Column(name = "UNIT")
@ApiParam("单位")
public String unit;
@Column(name = "REF_ORDER_NO")
@ApiParam("关联单号")
private String refOrderNo;
@Column(name = "SRC_WH_NO")
@ApiParam("源仓库代码")
public String srcWhNo;
@Column(name = "SRC_ZONE_NO")
@ApiParam("源存储区代码")
public String srcZoneNo;
@Column(name = "SRC_LOCATE_NO")
@ApiParam("源库位代码")
public String srcLocateNo;
@Column(name = "DEST_WH_NO")
@ApiParam("目标仓库代码")
public String destWhNo;
@Column(name = "DEST_ZONE_NO")
@ApiParam("目标存储区代码")
public String destZoneNo;
@Column(name = "DEST_LOCATE_NO")
@ApiParam("目标库位代码")
public String destLocateNo;
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "条码打印数量", example = "1")
private Double printQty;
@Column(name = "PLAN_DATE")
@ApiParam(value = "计划日期")
private String planDate;
@Column(name = "PLAN_TIME")
@ApiParam(value = "计划时间")
private String planTime;
@Column(name = "SRC_NO")
@ApiParam(value = "源单号")
private String srcNo;
/**
* :N=,C=
*/
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
private Integer itemStatus;
/**
* :0=,1=
*/
@Column(name = "IS_FREE")
@ApiParam(value = "是否免费", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer isFree;
@Column(name = "REMARK")
@ApiParam(value = "操作原因")
private String remark;
@Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已拣货数量", example = "1")
private Double pickQty;
@Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已出库数量", example = "1")
private Double outQty;
@Column(name = "REC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已收货数量", example = "1")
private Double recQty;
@Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已移库数量", example = "1")
private Double moveQty;
@Column(name = "TASK_GENERATE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "任务生成数量", example = "1")
private Double taskGenerateQty;
@Column(name = "SRC_AREA_NO")
@ApiParam("源库存地代码")
public String srcAreaNo;
@Column(name = "DEST_AREA_NO")
@ApiParam("目的库存地代码")
public String destAreaNo;
@Column(name = "LOT_NO")
@ApiParam("批次")
public String lotNo;
@Column(name="SRC_ITEM", columnDefinition="varchar(50) default ''",nullable=false)
@ApiParam("源单行号")
public String srcItem;
@Column(name = "CUST_ORDER_NO")
@ApiParam("客户订单号")
public String custOrderNo;
@Column(name = "ASSIGN_DATE_CODE")
@ApiParam(value = "指定生产日期")
private String assignDateCode;
@Transient
@ApiParam("实际批次")
private String actualLot;
@Transient
@ApiParam("实际数量")
private Double actualQty;
@Transient
@ApiParam("推荐批次")
private String recommondLot;
@Transient
@ApiParam("推荐库位")
private String recommondLocateNo;
@Transient
@ApiParam("前端表格编辑使用")
private Boolean isSet = false;
@Transient
@ApiParam("生产日期")
public String dateCode;
@ApiParam(value = "散件移库输入移库数量")
@Transient
public Double inputMoveQty;
@Transient
@ApiParam(value = "标准包装", example = "1")
private Double snp;
@Transient
@ApiParam(value = "条码总数量", example = "1")
private Double detailsSnCount;
@Transient
@ApiParam(value = "余数", example = "1")
private Double restQty;
@Transient
@ApiParam("任务状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
private Integer isTask;
@Transient
@ApiParam("主表单据状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
private Integer orderMasterStatus;
@Transient
@ApiParam("打印状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
private Integer printStatus;
@Transient
@ApiParam("优先级")
private Integer priority;
@Transient
@ApiParam(value = "汇总需求数量", example = "0")
public Double sumQty;
@Transient
@ApiParam(value = "汇总拣货数量", example = "0")
public Double sumPickQty;
@Transient
@ApiParam("执行状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description")
private Integer executeStatus;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public transient Integer lockVersion;
@Transient
@ApiParam("移动类型")
public Integer moveType;
@Transient
@ApiParam("业务类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
public Integer busiType;
@Column(name = "IS_SN")
@ApiParam(value = "条码生成状态", example = "20")
public Integer isSn;
public WmsTmsShippingExtDetail () {
}
public String getRecommondLot() {
return recommondLot == null ? "无" : this.recommondLot;
}
public Double getQty() {
return qty == null ? 0D : this.qty.doubleValue();
}
public Double getOutQty() {
return outQty == null ? 0D : this.outQty.doubleValue();
}
public Double getPickQty() {
return pickQty == null ? 0D : this.pickQty.doubleValue();
}
public Double getActualQty() {
return actualQty == null ? 0D : this.actualQty.doubleValue();
}
public Double getRecQty() {
return recQty == null ? 0D : this.recQty.doubleValue();
}
public Integer getIsTaskVal() {
return isTask == null ? 0 : this.isTask.intValue();
}
public Integer getOrderMasterStatus() {
return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue();
}
public WmsTmsShippingExtDetail(WmsDocMovementDetails docMovementDetails,String moveNo) {
this.moveNo = moveNo;
this.partNo = docMovementDetails.getPartNo();
this.partNameRdd = docMovementDetails.getPartNameRdd();
this.item = docMovementDetails.getItem();
this.qty =docMovementDetails.getQty();
this.unit = docMovementDetails.getUnit();
this.srcWhNo = docMovementDetails.getSrcWhNo();
this.srcZoneNo = docMovementDetails.getSrcZoneNo();
this.srcLocateNo = docMovementDetails.getSrcLocateNo();
this.destWhNo = docMovementDetails.getDestWhNo();
this.destZoneNo = docMovementDetails.getDestZoneNo();
this.destLocateNo = docMovementDetails.getDestLocateNo();
this.printQty = docMovementDetails.getPrintQty();
this.planDate = docMovementDetails.getPlanDate();
this.planTime = docMovementDetails.getPlanTime();
this.srcNo = docMovementDetails.getSrcNo();
this.itemStatus = docMovementDetails.getItemStatus();
this.isFree = docMovementDetails.getIsFree();
this.remark = docMovementDetails.getRemark();
this.pickQty = docMovementDetails.getPickQty();
this.outQty = docMovementDetails.getOutQty();
this.recQty = docMovementDetails.getRecQty();
this.moveQty = docMovementDetails.getMoveQty();
this.taskGenerateQty = docMovementDetails.getTaskGenerateQty();
this.srcAreaNo = docMovementDetails.getSrcAreaNo();
this.destAreaNo = docMovementDetails.getDestAreaNo();
this.lotNo = docMovementDetails.getLotNo();
this.srcItem = docMovementDetails.getSrcItem();
this.refOrderNo = docMovementDetails.getOrderNo();
this.custOrderNo = docMovementDetails.getCustOrderNo();
this.assignDateCode = docMovementDetails.getAssignDateCode();
this.actualLot = docMovementDetails.getActualLot();
this.actualQty = docMovementDetails.getActualQty();
this.recommondLot = docMovementDetails.getRecommondLot();
this.recommondLocateNo = docMovementDetails.getRecommondLocateNo();
this.isSet = docMovementDetails.getIsSet();
this.dateCode = docMovementDetails.getDateCode();
this.inputMoveQty = docMovementDetails.getInputMoveQty();
this.snp = docMovementDetails.getSnp();
this.detailsSnCount = docMovementDetails.getDetailsSnCount();
this.restQty = docMovementDetails.getRestQty();
this.isTask = docMovementDetails.getIsTask();
this.orderMasterStatus = docMovementDetails.getOrderMasterStatus();
this.printStatus = docMovementDetails.getPrintStatus();
this.priority = docMovementDetails.getPriority();
this.sumQty = docMovementDetails.getSumQty();
this.sumPickQty = docMovementDetails.getSumPickQty();
this.executeStatus = docMovementDetails.getExecuteStatus();
this.lockVersion = docMovementDetails.getLockVersion();
this.moveType = docMovementDetails.getMoveType();
this.busiType = docMovementDetails.getBusiType();
this.isSn = docMovementDetails.getIsSn();
}
}

@ -1,175 +0,0 @@
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;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :
* @Reference :
* @Author : qianhuasheng
* @CreateDate : 2019-12-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_TMS_SHIPPING_EXT_SN")
@Api("装车单条码明细")
public class WmsTmsShippingExtSn extends BaseBean {
private static final long serialVersionUID = 5704546384179442907L;
@Column(name="MOVE_NO")
@ApiParam("装车单")
public String moveNo;
@Column(name="ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@Column(name="ITEM")
@ApiParam("行号")
public String item;
@Column(name="PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@Column(name="UNIT")
@ApiParam("单位")
public String unit;
/**
* itemStatus
*/
@Column(name="SN_STATUS")
@ApiParam(value = "操作状态", example = "10")
@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer snStatus;
@Column(name="SN")
@ApiParam("条码")
public String sn;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编码")
public String vendorNo;
@Column(name = "SN_TYPE")
@ApiParam(value = "条码类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")
private Integer snType;
@Transient
@ApiParam("前端表格编辑使用")
private Boolean isSet = false;
@Transient
@ApiParam("目标库位代码")
public String destLocateNo;
@Transient
@ApiParam("源库位代码")
public String srcLocateNo;
@Transient
@ApiParam("生产日期")
public String dateCode;
@ApiParam(value = "散件移库输入移库数量")
@Transient
public Double inputMoveQty;
@Transient
@ApiParam("计划交货日期")
private String planDate;
@Transient
@ApiParam("计划交货时间")
private String planTime;
@Transient
@ApiParam("ERP库存地")
private String erpWhNo;
@Transient
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer itemStatus;
@Transient
@ApiParam("客户零件号")
private String customerPartNo;
@Transient
@ApiParam("父层级packcode对应的可回用零件号")
private String parentReturnPart;
@Transient
@ApiParam("打印模板")
private String templateNo;
@Transient
@ApiParam("剩余箱数量")
private Long countBox;
public WmsTmsShippingExtSn(){}
public WmsTmsShippingExtSn(Long countBox,String partNo) {
this.countBox = countBox;
this.partNo = partNo;
}
public WmsTmsShippingExtSn(String moveNo,WmsDocMovementSn docMovementSn) {
this.moveNo = moveNo;
this.orderNo = docMovementSn.getOrderNo();
this.item = docMovementSn.getItem();
this.partNo = docMovementSn.getPartNo();
this.partNameRdd = docMovementSn.getPartNameRdd();
this.qty = docMovementSn.getQty();
this.unit = docMovementSn.getUnit();
this.snStatus = docMovementSn.getSnStatus();
this.sn = docMovementSn.getSn();
this.vendorNo = docMovementSn.getVendorNo();
this.snType = docMovementSn.getSnType();
this.isSet = docMovementSn.getIsSet();
this.destLocateNo = docMovementSn.getDestLocateNo();
this.srcLocateNo = docMovementSn.getSrcLocateNo();
this.dateCode = docMovementSn.getDateCode();
this.inputMoveQty = docMovementSn.getInputMoveQty();
this.planDate = docMovementSn.getPlanDate();
this.planTime = docMovementSn.getPlanTime();
this.erpWhNo = docMovementSn.getErpWhNo();
this.itemStatus = docMovementSn.getItemStatus();
this.customerPartNo = docMovementSn.getCustomerPartNo();
this.parentReturnPart = docMovementSn.getParentReturnPart();
this.templateNo = docMovementSn.getTemplateNo();
this.countBox = docMovementSn.getCountBox();
}
}

@ -1,17 +0,0 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtDetail;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @author: qianhuasheng
* @date: 2019/9/19 14:22
* @Modify:
*/
@Repository
public interface IWmsTmsShippingExtDetailRepository extends BaseRepository<WmsTmsShippingExtDetail,Long> {
}

@ -1,17 +0,0 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtSn;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @author: qianhuasheng
* @date: 2019/9/19 14:22
* @Modify:
*/
@Repository
public interface IWmsTmsShippingExtSnRepository extends BaseRepository<WmsTmsShippingExtSn,Long> {
}
Loading…
Cancel
Save