Merge remote-tracking branch 'origin/dev' into dev

yun-zuoyi
汪云昊 6 years ago
commit 0656fa6078

@ -0,0 +1,119 @@
package cn.estsh.i3plus.pojo.wms.bean;
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.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : WMS_
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2019-06-26 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_DOC_FG_DETAIL")
@Api("WMS_产品报工明细信息")
public class WmsDocFgDetail extends BaseBean {
@Column(name="ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@Column(name="WO_NO")
@ApiParam("ERP工单号")
public String woNo;
@Column(name="LINE_NO")
@ApiParam("生产线")
public String lineNo;
@Column(name="COMMIT_TIME")
@ApiParam("提交日期")
public String commitTime;
@Column(name="MFG_LOG_NO")
@ApiParam("生产批次")
public String mfgLocNo;
@Column(name="SN")
@ApiParam("条码")
public String sn;
@Column(name="PART_NO")
@ApiParam(value = "物料编码")
public String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("单位")
public String partNameRdd;
@Column(name="BOM_UPDATE")
@ApiParam("BOM切换标识")
public String bomUpdate;
@Column(name="QTY")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@Column(name="UNIT")
@ApiParam("单位")
public String unit;
@Column(name="IN_AREA_NO")
@ApiParam("入库ERP库存地")
public String inAreaNo;
@Column(name="ITEM_PART_NO")
@ApiParam("子物料号")
public String itemPartNo;
@Column(name="ITEM_PART_NAME")
@ApiParam("子料物料描述")
public String itemPartName;
@Column(name="ITEM_UNIT")
@ApiParam("子计量单位")
public String itemUnit;
@Column(name="ITEM_QTY")
@ColumnDefault("0")
@ApiParam(value = "子用量", example = "0")
public Double itemQty;
@Column(name="OUT_AREA_NO")
@ApiParam("消耗ERP库存地")
public String outAreaNo;
@Column(name="SID")
@ApiParam("SID")
public String sid;
/**
* :10=,20=,30=
*/
@Column(name="ORDER_STATUS")
@ApiParam(value = "状态", example = "1")
public Integer orderStatus;
/**
* :ZMMES=MES,TBMES=MES
*/
@Column(name="SRC")
@ApiParam("单据来源")
public String src;
}

@ -63,4 +63,8 @@ public class WmsMoveMaster extends BaseBean {
@Column(name = "CAR_NO")
@ApiParam(value = "车牌号")
private String carNo;
@Column(name = "BUSI_TYPE_CODE")
@ApiParam(value = "业务类型编码")
private Integer busiTypeCode;
}

@ -150,6 +150,21 @@ public class WmsMoveSn extends BaseBean {
@ApiParam("特殊批次")
public String fixLotNo;
@Transient
@ApiParam("业务类型编码")
private String busiTypeCode;
@Transient
@ApiParam(value = "交易类型代码")
private String transTypeCode;
@Transient
@ApiParam("关联单号")
public String refSrc;
public WmsMoveSn(){}
public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){
@ -165,4 +180,20 @@ public class WmsMoveSn extends BaseBean {
public Long getFinishedCounts() {
return finishedCounts == null ? 0L : this.finishedCounts;
}
public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String busiTypeCode, String transTypeCode, String refSrc) {
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.destQty = destQty;
this.busiTypeCode = busiTypeCode;
this.transTypeCode = transTypeCode;
this.refSrc = refSrc;
}
public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String transTypeCode, String refSrc) {
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.destQty = destQty;
this.transTypeCode = transTypeCode;
this.refSrc = refSrc;
}
}

@ -151,10 +151,6 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "客户条码")
private String custSn;
@Column(name = "ERP_ZONE_NO")
@ApiParam(value = "ERP库存地")
public String erpZoneNo;
@ApiParam(value = "仓库名称")
@Transient
public String whNameRdd;

@ -0,0 +1,46 @@
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;
/**
* @author Yerik Stone
* @description WmsMoveUnfinishedOrderModel
* @date 2019/6/26
*/
@Data
@Api("未完成订单模型")
public class WmsMoveUnfinishedOrderModel extends BaseBean{
@ApiParam("物料编码")
private String partNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("未完成数量")
private Double destQty;
@ApiParam("业务类型")
private Integer busiTypeCode;
@ApiParam("交易类型")
private String transTypeCode;
@ApiParam("关联单号")
private String refSrc;
public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) {
this.organizeCode = organizeCode;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.destQty = destQty;
this.busiTypeCode = busiTypeCode;
this.transTypeCode = transTypeCode;
this.refSrc = refSrc;
}
}

@ -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.BasCustomer;
import cn.estsh.i3plus.pojo.wms.bean.WmsDocFgDetail;
import org.springframework.stereotype.Repository;
/**
* @Description :WMS_
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2019-06-26 16:03
* @Modify:
**/
@Repository
public interface WmsDocFgDetailRepository extends BaseRepository<WmsDocFgDetail,Long> {
}
Loading…
Cancel
Save