Merge remote-tracking branch 'origin/test' into test
# Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.javayun-zuoyi
songss
5 years ago
commit
c5de9c9841
@ -0,0 +1,79 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.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.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 : jason.niu
|
||||
* @CreateDate : 2020-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Table(name = "SWEB_REQUIRE_ALARM")
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("库存需求报警")
|
||||
public class SwebRequireAlarm extends BaseBean {
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料代码")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME")
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@Column(name = "VENDOR_CODE")
|
||||
@ApiParam("供应商代码")
|
||||
private String vendorCode;
|
||||
|
||||
@Column(name = "VENDOR_NAME")
|
||||
@ApiParam("供应商名称")
|
||||
private String vendorName;
|
||||
|
||||
@Column(name = "START_QTY")
|
||||
@ApiParam("开班库存")
|
||||
private Double startQty;
|
||||
|
||||
@Column(name = "ALARM_LEVEL")
|
||||
@ApiParam("报警级别")
|
||||
private String alarmLevel;
|
||||
|
||||
@Column(name = "REASON")
|
||||
@ApiParam("原因分析")
|
||||
private String reason;
|
||||
|
||||
@Column(name = "TRACK_REMARK")
|
||||
@ApiParam("跟踪情况")
|
||||
private String trackRemark;
|
||||
|
||||
@Column(name = "COUNT_DATE")
|
||||
@ApiParam("日期")
|
||||
private String countDate;
|
||||
|
||||
@Column(name = "REQUEST_QTY")
|
||||
@ApiParam("需求数量")
|
||||
private String requestQty;
|
||||
|
||||
@Transient
|
||||
@ApiParam("日期")
|
||||
private String dateStart;
|
||||
|
||||
@Transient
|
||||
@ApiParam("日期")
|
||||
private String dateEnd;
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.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.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 : jason.niu
|
||||
* @CreateDate : 2020-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Table(name = "SWEB_VENDOR_STOCK")
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("供应商安全库存")
|
||||
public class SwebVendorStock extends BaseBean {
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料代码")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME")
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@Column(name = "VENDOR_CODE")
|
||||
@ApiParam("供应商代码")
|
||||
private String vendorCode;
|
||||
|
||||
@Column(name = "VENDOR_NAME")
|
||||
@ApiParam("供应商名称")
|
||||
private String vendorName;
|
||||
|
||||
@Column(name = "SAFE_TYPE")
|
||||
@ApiParam("安全库存计算类型")
|
||||
private Integer safeType;
|
||||
|
||||
@Column(name = "SAFE_VALUE")
|
||||
@ApiParam("计数值")
|
||||
private String safeValue;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam("库存数量")
|
||||
private Double qty;
|
||||
|
||||
@Column(name = "COUNT_MONTH")
|
||||
@ApiParam("月份")
|
||||
private String countMonth;
|
||||
|
||||
@Column(name = "COUNT_WEEK")
|
||||
@ApiParam("周")
|
||||
private String countWeek;
|
||||
|
||||
@Transient
|
||||
@ApiParam("日期")
|
||||
private String dateStart;
|
||||
|
||||
@Transient
|
||||
@ApiParam("日期")
|
||||
private String dateEnd;
|
||||
}
|
||||
@ -0,0 +1,92 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.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.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 : jason.niu
|
||||
* @CreateDate : 2020-09-16
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Table(name = "SWEB_VENDOR_SUPPLIER_CAPCITY")
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("供应商供货能力")
|
||||
public class SwebVendorSupplierCapcity extends BaseBean {
|
||||
private static final long serialVersionUID = 2327910806789997252L;
|
||||
|
||||
@Column(name = "VENDOR_CODE")
|
||||
@ApiParam("供应商代码")
|
||||
private String vendorCode;
|
||||
|
||||
@Column(name = "VENDOR_NAME")
|
||||
@ApiParam("供应商名称")
|
||||
private String vendorName;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料编码")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME")
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@Column(name = "CURRENT_QTY")
|
||||
@ApiParam("当前库存")
|
||||
private Double currentQty;
|
||||
|
||||
@Column(name = "PLAN_PRODUCT_QTY")
|
||||
@ApiParam("计划生产或到货")
|
||||
private Double planProductQty;
|
||||
|
||||
@Column(name = "PLAN_REQUEST_QTY")
|
||||
@ApiParam("计划需求数量")
|
||||
private Double planRequestQty;
|
||||
|
||||
@Column(name = "END_QTY")
|
||||
@ApiParam("期末库存")
|
||||
private Double endQty;
|
||||
|
||||
@Column(name = "IS_DANGER")
|
||||
@ApiParam("是否存在风险")
|
||||
private Integer isDanger;
|
||||
|
||||
@Column(name = "DANGER_SPEC")
|
||||
@ApiParam("风险描述")
|
||||
private String dangerSpec;
|
||||
|
||||
@Column(name = "STATUS")
|
||||
@ApiParam("状态")
|
||||
private String status;
|
||||
|
||||
@Column(name = "REMARK")
|
||||
@ApiParam("备注")
|
||||
private String remark;
|
||||
|
||||
@Column(name = "TRACK_DATE")
|
||||
@ApiParam("日期")
|
||||
private String trackDate;
|
||||
|
||||
@Transient
|
||||
@ApiParam("日期")
|
||||
private String dateStart;
|
||||
|
||||
@Transient
|
||||
@ApiParam("日期")
|
||||
private String dateEnd;
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.sweb.bean.SwebRequireAlarm;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 库存需求报警
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface SwebRequireAlarmRepository extends BaseRepository<SwebRequireAlarm, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorStock;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 供应商安全库存
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface SwebVendorStockRepository extends BaseRepository<SwebVendorStock, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorSupplierCapcity;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :供应商供货能力
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface SwebVendorSupplierCapcityRepository extends BaseRepository<SwebVendorSupplierCapcity, Long> {
|
||||
}
|
||||
@ -0,0 +1,71 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
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 io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Lob;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description : 用户需要查询的服务调用详细日志
|
||||
* @Reference :
|
||||
* @Author : rock.yu
|
||||
* @CreateDate : 2020-09-19 15:54
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "WMS_SERVICE_LOG")
|
||||
@Api("服务调用详细日志")
|
||||
public class WmsServiceLog extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = 1285495680337747968L;
|
||||
|
||||
@Column(name = "CALL_TIME")
|
||||
@ApiParam("调用时间")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
public String callTIme;
|
||||
|
||||
@Column(name = "SERVICE_CODE")
|
||||
@ApiParam("服务代码")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
public String serviceCode;
|
||||
|
||||
@Column(name = "SERVICE_NAME")
|
||||
@ApiParam("服务名称")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
public String serviceName;
|
||||
|
||||
@Column(name = "JOB_CODE")
|
||||
@ApiParam(value = "JOB代码")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String jobCode;
|
||||
|
||||
@Column(name = "JOB_NAME")
|
||||
@ApiParam(value = "JOB名称")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String jobName;
|
||||
|
||||
@Lob
|
||||
@Column(name = "OUTPUT_MESSAGE")
|
||||
@ApiParam(value = "输出信息")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String outPutMessage;
|
||||
|
||||
@Column(name = "LEVEL")
|
||||
@ApiParam(value = "日志级别")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String level;
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsServiceLog;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 服务调用详细日志表
|
||||
* @Reference :
|
||||
* @Author : rock.yu
|
||||
* @CreateDate : 2020-09-19 16:04
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsServiceLogRepository extends BaseRepository<WmsServiceLog, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue