Merge branch 'test'

yun-zuoyi
WYnneaoapc 5 years ago
commit 372cc438f2

@ -36,12 +36,12 @@ import java.util.List;
public class Work extends BaseAPS {
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)
@FieldAnnotation(popSearch = true, mainkey = true, modify = false)
private String code;
@Column(name="ORDER_ID")
@ApiParam(value ="订单")
@FieldAnnotation(relation = "Order")
@FieldAnnotation(relation = "Order", modify = false)
private Long orderId;
@Column(name="WORK_TYPE")
@ -77,9 +77,10 @@ public class Work extends BaseAPS {
@ApiParam(value ="指定数量")
private Double specifyCount;
@Column(name="SPECIFY_RESOURCE")
@ApiParam(value ="指定资源")
private String specifyResource;
@Column(name="SPECIFY_RESOURCE_ID")
@ApiParam(value ="指定主资源")
@FieldAnnotation(relation = "SpecifyResource")
private Long specifyResourceId;
@Column(name="SPECIFY_PRODUCE_TIME")
@ApiParam(value ="指定制造时间")
@ -223,4 +224,13 @@ public class Work extends BaseAPS {
@JsonBackReference
public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EWork.WorkPlans); }
public Resource getSpecifyResource() {
return BeanRelation.get(this, EWork.SpecifyResource);
}
public void setSpecifyResource(Resource resource) {
this.specifyResourceId = resource != null ? resource.getId() : 0;
BeanRelation.set(this, EWork.SpecifyResource, resource);
}
}

@ -113,6 +113,11 @@ public class WorkPlan extends BaseAPS {
@FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private Integer lockTime;
@Column(name="FORCE_POST_SET_ZERO")
@ApiParam(value ="是否将后设置时间强制设置成0")
@FieldAnnotation(property = false)
private Boolean forcePostSetZero;
@Column(name="WORK_RESOURCE_ID")
@ApiParam(value ="工作资源对象id")
@FieldAnnotation(property = false)

@ -30,27 +30,27 @@ public class WorkRelation extends BaseAPS {
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(relation = "Material")
@FieldAnnotation(relation = "Material", modify = false)
private Long materialId;
@Column(name="PREV_ORDER_ID")
@ApiParam(value ="前订单")
@FieldAnnotation(relation = "PrevOrder")
@FieldAnnotation(relation = "PrevOrder", modify = false)
private Long prevOrderId;
@Column(name="POST_ORDER_ID")
@ApiParam(value ="后订单")
@FieldAnnotation(relation = "PostOrder")
@FieldAnnotation(relation = "PostOrder", modify = false)
private Long postOrderId;
@Column(name="PREV_WORK_ID")
@ApiParam(value ="前工作")
@FieldAnnotation(relation = "PrevWork")
@FieldAnnotation(relation = "PrevWork", modify = false)
private Long prevWorkId;
@Column(name="POST_WORK_ID")
@ApiParam(value ="后工作")
@FieldAnnotation(relation = "PostWork")
@FieldAnnotation(relation = "PostWork", modify = false)
private Long postWorkId;
@Column(name="COUNT", columnDefinition = "decimal(18,8)")

@ -12,4 +12,5 @@ public enum EWork {
PlanFeedbacks, // 工作计划反馈
MainPlan, // 关联的为主资源的计划
WorkPlans, // 关联的工作计划
SpecifyResource, // 指定资源
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.aps.model;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class GanttOrderModel {
private Long id;
private String code;
private String name;
private List<GanttOrderModel> children = new ArrayList<>();
}

@ -18,4 +18,6 @@
</Relation>
<Relation field="PlanFeedbacks" name="PlanFeedback" reverse="Work" type="ONE_TO_MULTI" owner="true">
</Relation>
<Relation field="SpecifyResource" name="Resource" type="MULTI_TO_ONE">
</Relation>
</Class>

@ -17,9 +17,8 @@ public class MesEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_PATTERN_TYPE {
ONE(10, "一套发运"),
TRUE(20, "多套发运"),
FALSE(30, "单产品多套发运");
ONE_PROD(10, "单产品发运"),
MANY_PROD(20, "多产品发运");
private int value;
private String description;
@ -49,6 +48,41 @@ public class MesEnumUtil {
}
/**
* JIS
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_SCAN_SEQ_TYPE {
ONE_PROD(10, "整发"),
MANY_PROD(20, "单发");
private int value;
private String description;
MES_JIS_SCAN_SEQ_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

@ -80,7 +80,8 @@ public class MesQcCheckStandard extends BaseBean {
public MesQcCheckStandard() {
}
public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) {
public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) {
this.id = id;
this.partNo = partNo;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;

@ -0,0 +1,64 @@
package cn.estsh.i3plus.pojo.mes.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;
/**
* @Description :JIS
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-12-25
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_JIS_PATTERN")
@Api("JIS发运模式")
public class MesJisPattern extends BaseBean {
@Column(name = "PATTERN_NO")
@ApiParam("模式编号")
private String patternNo;
@Column(name = "PATTERN_NAME")
@ApiParam("模式名称")
private String patternName;
@Column(name = "RULE")
@ApiParam("规则")
private String rule;
@Column(name = "DESC")
@ApiParam("描述")
private String desc;
@Column(name = "TOP_NO")
@ApiParam("一次显示TOP数")
private Integer topNo;
@Column(name = "HANDLE_NO")
@ApiParam("一次处理套数")
private Integer handleNo;
@Column(name = "PATTERN_TYPE")
@ApiParam("模式类型")
private Integer patternType;
@Column(name = "SCAN_SEQ_TYPE")
@ApiParam("产品组扫描顺序类型")
private Integer scanSeqType;
}

@ -0,0 +1,56 @@
package cn.estsh.i3plus.pojo.mes.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;
/**
* @Description :JIS
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-12-24
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_JIS")
@Api("JIS发运队列")
public class MesQueueJis extends BaseBean {
@Column(name = "JIS_NO")
@ApiParam("主队列编号")
private String jisNo;
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
@Column(name = "CAR_NO")
@ApiParam("车号")
private String carNo;
@Column(name = "SEQ")
@ApiParam("排序")
private Double seq;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
}

@ -0,0 +1,56 @@
package cn.estsh.i3plus.pojo.mes.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;
/**
* @Description :JIS
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-12-24
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_JIS_DETAIL")
@Api("JIS发运队列明细")
public class MesQueueJisDetail extends BaseBean {
@Column(name = "JIS_NO")
@ApiParam("主队列编号")
private String jisNo;
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesJisPattern;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-12-25
* @Modify:
**/
@Repository
public interface MesJisPatternRepository extends BaseRepository<MesJisPattern, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueJisDetail;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-12-25
* @Modify:
**/
@Repository
public interface MesQueueJisDetailRepository extends BaseRepository<MesQueueJisDetail, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueJis;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-12-25
* @Modify:
**/
@Repository
public interface MesQueueJisRepository extends BaseRepository<MesQueueJis, Long> {
}

@ -2098,5 +2098,31 @@ public class MesHqlPack {
return packBean;
}
/**
* JIS
* @param jisPattern
* @param organizeCode
* @return
*/
public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode);
if (!StringUtils.isEmpty(jisPattern.getPatternNo())) {
DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean);
}
if (!StringUtils.isEmpty(jisPattern.getTopNo())) {
DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean);
}
if (!StringUtils.isEmpty(jisPattern.getHandleNo())) {
DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean);
}
if (!StringUtils.isEmpty(jisPattern.getPatternType())) {
DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean);
}
if (!StringUtils.isEmpty(jisPattern.getScanSeqType())) {
DdlPreparedPack.getNumEqualPack(jisPattern.getScanSeqType(), "scanSeqType", packBean);
}
return packBean;
}
}

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
import com.thoughtworks.xstream.annotations.XStreamOmitField;
@ -90,6 +91,7 @@ public class SuitClientModel {
/**
*
*/
@JsonIgnore
@XStreamCDATA
private Object suitResultMessage;

@ -4,19 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource;
import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKeyParam;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule;
import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase;
import cn.estsh.i3plus.pojo.softswitch.bean.*;
/**
* @Description :
@ -415,7 +403,6 @@ public class SoftSwitchHqlPack {
return ddlPackBean;
}
public static DdlPackBean packHqlSuitDataDetailBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
@ -426,4 +413,12 @@ public class SoftSwitchHqlPack {
return ddlPackBean;
}
public static DdlPackBean packHqlBsSuitRecordParam(BsSuitRecordParam bsSuitRecordParam){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bsSuitRecordParam.getSuitRecordId(),"suitRecordId",ddlPackBean);
return ddlPackBean;
}
}

@ -0,0 +1,73 @@
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 :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2018-11-07 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_ZONE_PART")
@Api("库区物料")
public class WmsZonePart extends BaseBean{
private static final long serialVersionUID = 9214639813072592546L;
@Column(name="ZONE_NO")
@ApiParam("存储区编号")
private String zoneNo;
@Column(name="PART_NO")
@ApiParam("物料编码")
private String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name="PULL_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "拉动数量", example = "0")
private Double pullQty;
@Column(name="MAX", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "最大值", example = "0")
private Double max;
@Column(name="MIN", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "最小值", example = "0")
private Double min;
@Column(name = "IS_GENERATE_PICKLIST")
@ApiParam(value = "是否生成领料单", example = "2")
private Integer isGeneratePickList;
@Column(name="MOQ", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "起订量", example = "0")
private Double moq;
@Column(name="SAFETY_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "安全量", example = "0")
private Double safetyQty;
}

@ -64,4 +64,10 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
@ApiParam("关联单号")
private String refOrderNo;
@ApiParam("开始时间")
private String createDateTimeStart;
@ApiParam("结束时间")
private String createDateTimeEnd;
}

@ -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.WmsZonePart;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2019-12-30 17:27
* @Modify:
**/
@Repository
public interface WmsZonePartRepository extends BaseRepository<WmsZonePart,Long> {
}

@ -2660,4 +2660,21 @@ public class WmsHqlPack {
return result;
}
/**
*
*
* @param wmsZonePart
* @return
*/
public static DdlPackBean packHqlWmsZonePart(WmsZonePart wmsZonePart) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(wmsZonePart.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(wmsZonePart.getZoneNo(), "zoneNo", result);
getStringBuilderPack(wmsZonePart, result);
return result;
}
}

Loading…
Cancel
Save