Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev-guo

yun-zuoyi
gsz 4 years ago
commit 3c9bb9fff0

@ -0,0 +1,27 @@
package cn.estsh.i3plus.pojo.andon.model;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author Wynne.Lu
* @date 2020/3/30 22:18
* @desc
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class FsmStatusModel {
private String from;
private String to;
private String event;
private Object context;
private String status;
}

@ -26,6 +26,7 @@ import javax.persistence.Table;
@Api("副资源设置时间")
public class AssistResourceSetTime extends BaseAPS {
private static final long serialVersionUID = 901172392855536686L;
@Column(name="RES_CODE")
@ApiParam(value ="资源编码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

@ -36,6 +36,7 @@ import java.util.List;
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class BaseOrder extends BaseAPS {
private static final long serialVersionUID = -2571085172798608026L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)
@ -121,7 +122,7 @@ public class BaseOrder extends BaseAPS {
}
public void setMaterial(Material material) {
this.materialId = material != null ? material.getId() : 0l;
this.materialId = material != null ? material.getId() : 0L;
BeanRelation.set(this, EBaseOrder.Material, material);
}

@ -25,6 +25,7 @@ import javax.persistence.MappedSuperclass;
@ExcludeImportExport
public class BaseRule extends BaseAPS {
private static final long serialVersionUID = -1818853814377611968L;
@Column(name="CODE")
@ApiParam(value ="规则编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -26,6 +26,7 @@ import javax.persistence.Table;
@Api("数据集成数据连接信息")
public class DataLink extends BaseAPS {
private static final long serialVersionUID = 8324774871058505466L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(notEmpty = true)

@ -32,6 +32,7 @@ import javax.persistence.Table;
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class DayShift extends BaseAPS {
private static final long serialVersionUID = 7964370027924366093L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -27,8 +27,8 @@ import javax.persistence.Table;
@Table(name = "APS_EXPORT_DETAIL")
@Api("数据导出明细")
public class ExportDetail extends BaseAPS {
private static final long serialVersionUID = -8898414164032180539L;
@Column(name="OUT_NAME")
@ApiParam(value ="外部表名")
private String outName;
@ -62,7 +62,7 @@ public class ExportDetail extends BaseAPS {
}
public void setProject(ExportProject project) {
this.projectId = project != null ? project.getId() : 0l;
this.projectId = project != null ? project.getId() : 0L;
BeanRelation.set(this, EExportDetail.Project, project);
}
}

@ -51,7 +51,7 @@ public class ExportProject extends BaseAPS {
}
public void setLink(DataLink link) {
this.linkId = link != null ? link.getId() : 0l;
this.linkId = link != null ? link.getId() : 0L;
BeanRelation.set(this, EExportProject.Link, link);
}

@ -25,6 +25,7 @@ import javax.persistence.Table;
@Api("表达式记录")
public class ExpressionRecord extends BaseAPS {
private static final long serialVersionUID = 4038954046132896632L;
@Column(name="BEAN_NAME")
@ApiParam(value ="表名")
private String beanName;

@ -34,6 +34,7 @@ import java.sql.JDBCType;
@ExcludeImportExport
public class FieldInfo extends BaseAPS {
private static final long serialVersionUID = -6195036426929675850L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -31,8 +31,8 @@ import java.util.List;
@Table(name="APS_FURNACE_PLAN")
@Api("炉资源计划")
public class FurnacePlan extends BaseAPS {
private static final long serialVersionUID = 6816465736285211114L;
@Column(name="CAPACITY", columnDefinition = "decimal(18,8)")
@ApiParam(value ="已占用的能力")
private Double capacity;

@ -26,6 +26,7 @@ import javax.persistence.Table;
@Api("排程运算规则")
public class HeuristicRule extends BaseRule {
private static final long serialVersionUID = -4856714428377308150L;
@Column(name="WORK_FILTER")
@ApiParam(value ="工作筛选")
private String workFilter;

@ -35,7 +35,6 @@ import java.util.List;
@Api("数据导入明细")
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class ImportDetail extends BaseAPS {
private static final long serialVersionUID = 1264030397500660450L;
@Column(name="NAME")
@ -117,6 +116,10 @@ public class ImportDetail extends BaseAPS {
@ApiParam(value ="外部对象筛选")
private String outterFilter;
@Column(name="UPDATE_SQL")
@ApiParam(value ="更新外部数据")
private String updateSQL;
@FieldAnnotation(property = false)
private transient ImportDataModel model;
@ -125,7 +128,7 @@ public class ImportDetail extends BaseAPS {
}
public void setProject(ImportProject project) {
this.projectId = project != null ? project.getId() : 0l;
this.projectId = project != null ? project.getId() : 0L;
BeanRelation.set(this, EImportDetail.Project, project);
}

@ -49,6 +49,10 @@ public class ImportField extends BaseAPS {
@ApiParam(value = "是否必填", example = "0")
private Integer isRequire;
@Column(name="IGNORE_NOT_VALID")
@ApiParam(value = "无效忽略", example = "0")
private Boolean ignoreNotValid;
@Column(name="MAX_LENGTH")
@ApiParam(value = "最大长度", example = "0")
@FieldAnnotation(defaultValue = "255")
@ -80,7 +84,7 @@ public class ImportField extends BaseAPS {
}
public void setImportDetail(ImportDetail detail) {
this.importDetailId = detail != null ? detail.getId() : 0l;
this.importDetailId = detail != null ? detail.getId() : 0L;
BeanRelation.set(this, EImportField.ImportDetail, detail);
}
}

@ -29,6 +29,7 @@ import java.util.List;
@Api("数据导入明细集合")
public class ImportProject extends BaseAPS {
private static final long serialVersionUID = -1899074765155621438L;
@Column(name="NAME")
@ApiParam(value ="标识名")
private String name;
@ -49,7 +50,7 @@ public class ImportProject extends BaseAPS {
}
public void setLink(DataLink link) {
this.linkId = link != null ? link.getId() : 0l;
this.linkId = link != null ? link.getId() : 0L;
BeanRelation.set(this, EImportProject.Link, link);
}

@ -46,10 +46,12 @@ public class InsertedOrder extends BaseOrder {
@Column(name="FINISH_COUNT")
@ApiParam(value ="完工数")
@FieldAnnotation(modify = false, defaultValue = "0")
private Double finishCount;
@Column(name="QUALIFIED_COUNT")
@ApiParam(value ="检验合格数量")
@FieldAnnotation(modify = false, defaultValue = "0")
private Double qualifiedCount;
@Column(name="REMARK")
@ -61,7 +63,7 @@ public class InsertedOrder extends BaseOrder {
}
public void setProductRouting(ProductRouting routing) {
this.productRoutingId = routing != null ? routing.getId() : 0l;
this.productRoutingId = routing != null ? routing.getId() : 0L;
BeanRelation.set(this, EInsertedOrder.ProductRouting, routing);
}

@ -44,7 +44,7 @@ public class InterMediateDetail extends BaseAPS {
public InterMediateResult getResult() { return BeanRelation.get(this, EInterMediateDetail.Result); }
public void setResult(InterMediateResult result) {
this.resultId = result != null ? result.getId() : 0;
this.resultId = result != null ? result.getId() : 0L;
BeanRelation.set(this, EInterMediateDetail.Result, result);
}
}

@ -51,14 +51,14 @@ public class InterMediateResult extends BaseAPS {
}
public void setWork(Work work) {
this.workId = work != null ? work.getId() : 0l;
this.workId = work != null ? work.getId() : 0L;
BeanRelation.set(this, EInterMediateResult.Work, work);
}
public Resource getResource() { return BeanRelation.get(this, EInterMediateResult.Resource); }
public void setResource(Resource resource) {
this.resourceId = resource != null ? resource.getId() : 0l;
this.resourceId = resource != null ? resource.getId() : 0L;
BeanRelation.set(this, EInterMediateResult.Resource, resource);
}

@ -25,6 +25,7 @@ import javax.persistence.Table;
@Api("物料运算规则")
public class MatCalcRule extends BaseRule {
private static final long serialVersionUID = 2102986260688118982L;
@Column(name="MATERIAL_FILTER")
@ApiParam(value ="物料筛选")
private String materialFilter;

@ -37,6 +37,7 @@ import java.util.List;
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class Material extends BaseAPS {
private static final long serialVersionUID = -7928225487946173108L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -48,7 +48,7 @@ public class MaterialDeliveryPromise extends BaseBean {
}
public void setMaterial(Material material) {
this.materialId = material != null ? material.getId() : 0l;
this.materialId = material != null ? material.getId() : 0L;
BeanRelation.set(this, EMaterialDeliveryPromise.Material, material);
}
}

@ -26,6 +26,7 @@ import javax.persistence.Table;
@Api("物料设置时间")
public class MaterialSetTime extends BaseAPS {
private static final long serialVersionUID = -7996431489447641539L;
@Column(name="RES_CODE")
@ApiParam(value ="资源编码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true, mainkey = true)
@ -45,9 +46,4 @@ public class MaterialSetTime extends BaseAPS {
@ApiParam(value ="设置时间")
@FieldAnnotation(notEmpty = true)
private String time;
// @Column(name="PRIORITY")
// @ApiParam(value ="优先级")
// @FieldAnnotation(defaultValue = "10", mainkey = true)
// private Integer priority;
}

@ -30,6 +30,7 @@ import java.util.List;
@Api("工序输入")
public class OperInput extends BaseAPS {
private static final long serialVersionUID = 6653235155693766804L;
@Column(name="OPERATION_ID")
@ApiParam(value ="工序")
@FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
@ -75,7 +76,7 @@ public class OperInput extends BaseAPS {
}
public void setOperation(Operation oper) {
this.operationId = oper != null ? oper.getId() : 0l;
this.operationId = oper != null ? oper.getId() : 0L;
BeanRelation.set(this, EOperInput.Operation, oper);
}
@ -84,7 +85,7 @@ public class OperInput extends BaseAPS {
}
public void setInputMaterial(Material material) {
this.inputMaterialId = material != null ? material.getId() : 0l;
this.inputMaterialId = material != null ? material.getId() : 0L;
BeanRelation.set(this, EOperInput.InputMaterial, material);
}

@ -29,6 +29,7 @@ import java.util.List;
@Api("工序输出")
public class OperOutput extends BaseAPS {
private static final long serialVersionUID = 3185682762290147209L;
@Column(name="OPERATION_ID")
@ApiParam(value ="工序")
@FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
@ -59,7 +60,7 @@ public class OperOutput extends BaseAPS {
}
public void setOperation(Operation oper) {
this.operationId = oper != null ? oper.getId() : 0l;
this.operationId = oper != null ? oper.getId() : 0L;
BeanRelation.set(this, EOperOutput.Operation, oper);
}
@ -68,7 +69,7 @@ public class OperOutput extends BaseAPS {
}
public void setOutputMaterial(Material material) {
this.outputMaterialId = material != null ? material.getId() : 0l;
this.outputMaterialId = material != null ? material.getId() : 0L;
BeanRelation.set(this, EOperOutput.OutputMaterial, material);
}

@ -30,6 +30,7 @@ import java.util.List;
@Api("工序资源")
public class OperResource extends BaseAPS {
private static final long serialVersionUID = -8683889582369342606L;
@Column(name="OPERATION_ID")
@ApiParam(value ="工序")
@FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
@ -88,7 +89,7 @@ public class OperResource extends BaseAPS {
}
public void setOperation(Operation oper) {
this.operationId = oper != null ? oper.getId() : 0l;
this.operationId = oper != null ? oper.getId() : 0L;
BeanRelation.set(this, EOperResource.Operation, oper);
}
@ -97,7 +98,7 @@ public class OperResource extends BaseAPS {
}
public void setResource(Resource res) {
this.resourceId = res != null ? res.getId() : 0l;
this.resourceId = res != null ? res.getId() : 0L;
BeanRelation.set(this, EOperResource.Resource, res);
}

@ -96,7 +96,7 @@ public class Operation extends BaseAPS {
}
public void setProductRouting(ProductRouting routing) {
this.productRoutingId = routing != null ? routing.getId() : 0l;
this.productRoutingId = routing != null ? routing.getId() : 0L;
BeanRelation.set(this, EOperation.ProductRouting, routing);
}
@ -120,7 +120,7 @@ public class Operation extends BaseAPS {
}
public void setStandOperation(StandOperation std) {
this.standOperationId = std != null ? std.getId() : 0l;
this.standOperationId = std != null ? std.getId() : 0L;
BeanRelation.set(this, EOperation.StandOperation, std);
}
}

@ -31,7 +31,7 @@ public class OrderFeedback extends BaseAPS {
@Column(name="ORDER_ID")
@ApiParam(value ="顶层订单号")
@FieldAnnotation(relation = "Order", modify = false)
@FieldAnnotation(mainkey = true, relation = "Order")
private Long orderId;
@Column(name="ORDER_COUNT")
@ -69,7 +69,7 @@ public class OrderFeedback extends BaseAPS {
}
public void setOrder(BaseOrder order) {
this.orderId = order != null ? order.getId() : 0l;
this.orderId = order != null ? order.getId() : 0L;
BeanRelation.set(this, EOrderFeedback.Order, order);
}
}

@ -25,6 +25,7 @@ import java.util.Date;
@ExcludeImportExport
public class OrderTree extends BaseAPS {
private static final long serialVersionUID = -7505923374791695738L;
@ApiParam(value ="物料编码")
private String material;

@ -33,6 +33,7 @@ import java.util.List;
@ExcludeImportExport
public class ParentWork extends BaseAPS {
private static final long serialVersionUID = 8792781216193806606L;
@Column(name="count", columnDefinition = "decimal(18,8)")
@ApiParam(value ="数量")
private Double count;
@ -57,7 +58,7 @@ public class ParentWork extends BaseAPS {
}
public void setProductOrder(ProductOrder order) {
this.productOrderId = order != null ? order.getId() : 0l;
this.productOrderId = order != null ? order.getId() : 0L;
BeanRelation.set(this, EParentWork.ProductOrder, order);
}
@ -66,7 +67,7 @@ public class ParentWork extends BaseAPS {
}
public void setOperation(Operation oper) {
this.operationId = oper != null ? oper.getId() : 0l;
this.operationId = oper != null ? oper.getId() : 0L;
BeanRelation.set(this, EParentWork.Operation, oper);
}

@ -1,9 +1,12 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback;
import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -26,13 +29,13 @@ import javax.persistence.Table;
@Entity
@Table(name = "APS_PLAN_FEEDBACK")
@Api("工作反馈")
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class PlanFeedback extends BaseAPS {
private static final long serialVersionUID = 2520555825093741381L;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(property = false)
@FieldAnnotation(popSearch = true, mainkey = true, relation = "Work")
private Long workId;
@Column(name="STATUS")
@ -52,7 +55,7 @@ public class PlanFeedback extends BaseAPS {
}
public void setWork(Work work) {
this.workId = work != null ? work.getId() : 0l;
this.workId = work != null ? work.getId() : 0L;
BeanRelation.set(this, EPlanFeedback.Work, work);
}
}

@ -31,6 +31,7 @@ import java.util.List;
@Api("生产订单")
public class ProductOrder extends BaseOrder {
private static final long serialVersionUID = 6900226668783662736L;
@Column(name="EST")
@ApiParam(value ="最早开始时间")
private Date est;
@ -56,11 +57,6 @@ public class ProductOrder extends BaseOrder {
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.OBJECT, typeName = "ProductRouting")
private String specifyRouting;
@Column(name="RECALC_COUNT")
@ApiParam(value ="是否重新计算数量")
@FieldAnnotation(defaultValue = "true")
private Boolean recalcCount;
@Column(name="SPECIFY_TOP_ORDER")
@ApiParam(value ="指定顶层订单")
private String specifyTopOrder;
@ -95,10 +91,12 @@ public class ProductOrder extends BaseOrder {
@Column(name="FINISH_COUNT")
@ApiParam(value ="完工数")
@FieldAnnotation(modify = false, defaultValue = "0")
private Double finishCount;
@Column(name="QUALIFIED_COUNT")
@ApiParam(value ="检验合格数量")
@FieldAnnotation(modify = false, defaultValue = "0")
private Double qualifiedCount;
@Column(name="PRODUCT_ROUTING_ID")
@ -116,7 +114,7 @@ public class ProductOrder extends BaseOrder {
}
public void setProductRouting(ProductRouting routing) {
this.productRoutingId = routing != null ? routing.getId() : 0l;
this.productRoutingId = routing != null ? routing.getId() : 0L;
BeanRelation.set(this, EProductOrder.ProductRouting, routing);
}

@ -34,6 +34,7 @@ import java.util.List;
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class ProductRouting extends BaseAPS {
private static final long serialVersionUID = 4905294866468216722L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)
@ -67,7 +68,7 @@ public class ProductRouting extends BaseAPS {
}
public void setMaterial(Material material) {
this.materialId = material != null ? material.getId() : 0l;
this.materialId = material != null ? material.getId() : 0L;
BeanRelation.set(this, EProductRouting.Material, material);
}

@ -99,18 +99,28 @@ public class Resource extends BaseAPS {
@FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
private Integer EfficiencyEffect;
@ApiParam(value ="是否存在任务冲突")
@FieldAnnotation(property = false)
@Transient
private boolean hasConflict;
@Column(name="BIND_RESOURCE_ID")
@ApiParam(value ="绑定资源")
@FieldAnnotation(relation = "Order", modify = false)
private Long bindResourceId;
public WorkShop getWorkShop() { return BeanRelation.get(this, EResource.WorkShop); }
public void setWorkShop(WorkShop workShop) {
this.workShopId = workShop != null ? workShop.getId() : 0l;
this.workShopId = workShop != null ? workShop.getId() : 0L;
BeanRelation.set(this, EResource.WorkShop, workShop);
}
@JsonBackReference
public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); }
public Resource getBindResource() { return BeanRelation.get(this, EResource.BindResource); }
public void setBindResource(Resource bindResource) {
this.bindResourceId = bindResource != null ? bindResource.getId() : 0L;
BeanRelation.set(this, EResource.BindResource, bindResource);
}
@JsonBackReference
public List<Resource> getSubBindResources() { return BeanRelation.list(this, EResource.SubBindResources); }
}

@ -43,10 +43,12 @@ public class SafeStockOrder extends BaseOrder {
@Column(name="FINISH_COUNT")
@ApiParam(value ="完工数")
@FieldAnnotation(modify = false, defaultValue = "0")
private Double finishCount;
@Column(name="QUALIFIED_COUNT")
@ApiParam(value ="检验合格数量")
@FieldAnnotation(modify = false, defaultValue = "0")
private Double qualifiedCount;
@JsonIgnore

@ -77,12 +77,12 @@ public class SalesOrder extends BaseOrder {
@Column(name="FINISH_COUNT")
@ApiParam(value ="完工数")
@FieldAnnotation(modify = false)
@FieldAnnotation(modify = false, defaultValue = "0")
private Double finishCount;
@Column(name="QUALIFIED_COUNT")
@ApiParam(value ="检验合格数量")
@FieldAnnotation(modify = false)
@FieldAnnotation(modify = false, defaultValue = "0")
private Double qualifiedCount;
@Column(name="SERIAL_NUMBER")

@ -52,6 +52,10 @@ public class SerialNumber extends BaseAPS {
@ApiParam(value ="插单流水号")
private Integer hNumber = 0;
@Column(name="Z_NUMBER")
@ApiParam(value ="补充订单流水号")
private Integer zNumber = 0;
@Column(name="LAST_DATE")
@ApiParam(value ="最后生成日期")
private Date lastDate;

@ -61,28 +61,28 @@ public class ShippingTime extends BaseAPS {
public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); }
public void setPrevRes(Resource res) {
this.prevResId = res != null ? res.getId() : 0l;
this.prevResId = res != null ? res.getId() : 0L;
BeanRelation.set(this, EShippingTime.PrevRes, res);
}
public Resource getPostRes() { return BeanRelation.get(this, EShippingTime.PostRes); }
public void setPostRes(Resource res) {
this.postResId = res != null ? res.getId() : 0l;
this.postResId = res != null ? res.getId() : 0L;
BeanRelation.set(this, EShippingTime.PostRes, res);
}
public StandOperation getPrevStand() { return BeanRelation.get(this, EShippingTime.PrevStand);}
public void setPrevStand(StandOperation stand) {
this.prevStandId = stand != null ? stand.getId() : 0l;
this.prevStandId = stand != null ? stand.getId() : 0L;
BeanRelation.set(this, EShippingTime.PrevStand, stand);
}
public StandOperation getPostStand() { return BeanRelation.get(this, EShippingTime.PostStand); }
public void setPostStand(StandOperation stand) {
this.postStandId = stand != null ? stand.getId() : 0l;
this.postStandId = stand != null ? stand.getId() : 0L;
BeanRelation.set(this, EShippingTime.PostStand, stand);
}
}

@ -96,7 +96,7 @@ public class StandOperation extends BaseAPS {
public WorkShop getWorkShop() { return BeanRelation.get(this, EStandOperation.WorkShop); }
public void setWorkShop(WorkShop workShop) {
this.workShopId = workShop != null ? workShop.getId() : 0l;
this.workShopId = workShop != null ? workShop.getId() : 0L;
BeanRelation.set(this, EStandOperation.WorkShop, workShop);
}
}

@ -194,7 +194,7 @@ public class Work extends BaseAPS {
}
public void setOrder(BaseOrder order) {
this.orderId = order != null ? order.getId() : 0l;
this.orderId = order != null ? order.getId() : 0L;
BeanRelation.set(this, EWork.Order, order);
}
@ -203,7 +203,7 @@ public class Work extends BaseAPS {
}
public void setOperation(Operation oper) {
this.operationId = oper != null ? oper.getId() : 0l;
this.operationId = oper != null ? oper.getId() : 0L;
BeanRelation.set(this, EWork.Operation, oper);
}
@ -212,7 +212,7 @@ public class Work extends BaseAPS {
}
public void setOriginOperation(Operation oper) {
this.originOperationId = oper != null ? oper.getId() : 0l;
this.originOperationId = oper != null ? oper.getId() : 0L;
BeanRelation.set(this, EWork.OriginOperation, oper);
}
@ -221,7 +221,7 @@ public class Work extends BaseAPS {
}
public void setParentWork(ParentWork parentWork) {
this.parentWorkId = parentWork != null ? parentWork.getId() : 0l;
this.parentWorkId = parentWork != null ? parentWork.getId() : 0L;
BeanRelation.set(this, EWork.ParentWork, parentWork);
}

@ -65,7 +65,7 @@ public class WorkInput extends BaseAPS {
}
public void setWork(Work work) {
this.workId = work != null ? work.getId() : 0l;
this.workId = work != null ? work.getId() : 0L;
BeanRelation.set(this, EWorkInput.Work, work);
}
@ -79,7 +79,7 @@ public class WorkInput extends BaseAPS {
}
public void setMaterial(Material material) {
this.materialId = material != null ? material.getId() : 0l;
this.materialId = material != null ? material.getId() : 0L;
BeanRelation.set(this, EWorkInput.Material, material);
}
@ -88,7 +88,7 @@ public class WorkInput extends BaseAPS {
}
public void setOperInput(OperInput input) {
this.operInputId = input != null ? input.getId() : 0l;
this.operInputId = input != null ? input.getId() : 0L;
BeanRelation.set(this, EWorkInput.OperInput, input);
}
}

@ -67,7 +67,7 @@ public class WorkOutput extends BaseAPS {
}
public void setWork(Work work) {
this.workId = work != null ? work.getId() : 0l;
this.workId = work != null ? work.getId() : 0L;
BeanRelation.set(this, EWorkOutput.Work, work);
}
@ -81,7 +81,7 @@ public class WorkOutput extends BaseAPS {
}
public void setMaterial(Material material) {
this.materialId = material != null ? material.getId() : 0l;
this.materialId = material != null ? material.getId() : 0L;
BeanRelation.set(this, EWorkOutput.Material, material);
}
@ -90,7 +90,7 @@ public class WorkOutput extends BaseAPS {
}
public void setOperOutput(OperOutput output) {
this.operOutputId = output != null ? output.getId() : 0l;
this.operOutputId = output != null ? output.getId() : 0L;
BeanRelation.set(this, EWorkOutput.OperOutput, output);
}
}

@ -36,8 +36,8 @@ import java.util.List;
@Table(name="APS_WORK_PLAN")
@Api("工作计划")
public class WorkPlan extends BaseAPS {
private static final long serialVersionUID = 5489548115780676195L;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(relation = "Work")
@ -136,6 +136,9 @@ public class WorkPlan extends BaseAPS {
@RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse")
private Date resProduceEnd;
@ApiParam(value ="调整时间")
private Date adjustDate;
public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
public void setWork(Work work) {

@ -102,7 +102,7 @@ public class WorkRelation extends BaseAPS {
}
public void setWorkInput(WorkInput input) {
this.workInputId = input != null ? input.getId() : 0l;
this.workInputId = input != null ? input.getId() : 0L;
BeanRelation.set(this, EWorkRelation.WorkInput, input);
}
@ -111,7 +111,7 @@ public class WorkRelation extends BaseAPS {
}
public void setWorkOutput(WorkOutput output) {
this.workOutputId = output != null ? output.getId() : 0l;
this.workOutputId = output != null ? output.getId() : 0L;
BeanRelation.set(this, EWorkRelation.WorkOutput, output);
}
@ -120,7 +120,7 @@ public class WorkRelation extends BaseAPS {
}
public void setPrevWork(Work work) {
this.prevWorkId = work != null ? work.getId() : 0l;
this.prevWorkId = work != null ? work.getId() : 0L;
BeanRelation.set(this, EWorkRelation.PrevWork, work);
}
@ -129,7 +129,7 @@ public class WorkRelation extends BaseAPS {
}
public void setPostWork(Work work) {
this.postWorkId = work != null ? work.getId() : 0l;
this.postWorkId = work != null ? work.getId() : 0L;
BeanRelation.set(this, EWorkRelation.PostWork, work);
}
@ -138,7 +138,7 @@ public class WorkRelation extends BaseAPS {
}
public void setPrevOrder(BaseOrder order) {
this.prevOrderId = order != null ? order.getId() : 0l;
this.prevOrderId = order != null ? order.getId() : 0L;
BeanRelation.set(this, EWorkRelation.PrevOrder, order);
}
@ -147,7 +147,7 @@ public class WorkRelation extends BaseAPS {
}
public void setPostOrder(BaseOrder order) {
this.postOrderId = order != null ? order.getId() : 0l;
this.postOrderId = order != null ? order.getId() : 0L;
BeanRelation.set(this, EWorkRelation.PostOrder, order);
}
@ -156,7 +156,7 @@ public class WorkRelation extends BaseAPS {
}
public void setMaterial(Material material) {
this.materialId = material != null ? material.getId() : 0l;
this.materialId = material != null ? material.getId() : 0L;
BeanRelation.set(this, EWorkRelation.Material, material);
}
}

@ -102,14 +102,14 @@ public class WorkResource extends BaseAPS {
@Column(name="RES_CAPACITY_ID")
@ApiParam(value ="设备能力id")
@FieldAnnotation(property = false)
private Long resCapacityId = 0l;
private Long resCapacityId = 0L;
public Work getWork() {
return BeanRelation.get(this, EWorkResource.Work);
}
public void setWork(Work work) {
this.workId = work != null ? work.getId() : 0l;
this.workId = work != null ? work.getId() : 0L;
BeanRelation.set(this, EWorkResource.Work, work);
}
@ -118,7 +118,7 @@ public class WorkResource extends BaseAPS {
}
public void setResource(Resource res) {
this.resourceId = res != null ? res.getId() : 0l;
this.resourceId = res != null ? res.getId() : 0L;
BeanRelation.set(this, EWorkResource.Resource, res);
}
@ -127,7 +127,7 @@ public class WorkResource extends BaseAPS {
}
public void setOperResource(OperResource res) {
this.operResourceId = res != null ? res.getId() : 0l;
this.operResourceId = res != null ? res.getId() : 0L;
BeanRelation.set(this, EWorkResource.OperResource, res);
}
}

@ -26,6 +26,7 @@ import java.util.HashMap;
@ExcludeImportExport
public abstract class BaseAPS extends BaseBean {
private static final long serialVersionUID = -8638842158403944318L;
@JsonIgnore
@Lob
@FieldAnnotation(property = false)

@ -17,10 +17,10 @@ import java.util.function.Consumer;
* @Modify:
**/
public class BeanInfo {
private Class<? extends BaseBean> cls;
private final Class<? extends BaseBean> cls;
private BeanInfo superBeanInfo;
private List<BeanInfo> childsBeanInfos = new ArrayList<>();
private Map<Enum<?>, RelationInfo> relations = new HashMap<>();
private final List<BeanInfo> childsBeanInfos = new ArrayList<>();
private final Map<Enum<?>, RelationInfo> relations = new HashMap<>();
public BeanInfo(Class<? extends BaseBean> cls) {
this.cls = cls;
@ -97,14 +97,6 @@ public class BeanInfo {
return (Class<T>)cls;
}
public BeanInfo getRelationBeanInfo(Enum<?> holder) {
RelationInfo relaInfo = getRelationInfo(holder);
if (relaInfo != null) {
return relaInfo.getBeanInfo();
}
return null;
}
public BeanInfo getRelationBeanInfo(String name) {
RelationInfo relaInfo = getRelationInfo(name);
if (relaInfo != null) {
@ -130,15 +122,6 @@ public class BeanInfo {
return RELATION_TYPE.INVALID;
}
public RELATION_TYPE getRelationType(String name) {
RelationInfo relaInfo = getRelationInfo(name);
if (relaInfo != null) {
return relaInfo.getType();
}
return RELATION_TYPE.INVALID;
}
private void foreach(Consumer<RelationInfo> fun) {
for (Map.Entry<Enum<?>, RelationInfo> entry : relations.entrySet()) {
fun.accept(entry.getValue());
@ -150,9 +133,7 @@ public class BeanInfo {
public List<Enum<?>> getAllHolders() {
List<Enum<?>> holders = new ArrayList<>();
foreach((RelationInfo info)->{
holders.add(info.getHolder());
});
foreach((RelationInfo info)-> holders.add(info.getHolder()));
return holders;
}
@ -176,8 +157,8 @@ public class BeanInfo {
return holders;
}
private static Map<Class<? extends BaseBean>, BeanInfo> beanInfos = new HashMap<>();
private static Map<String, BeanInfo> nameMapBeanInfos = new HashMap<>();
private static final Map<Class<? extends BaseBean>, BeanInfo> beanInfos = new HashMap<>();
private static final Map<String, BeanInfo> nameMapBeanInfos = new HashMap<>();
private static IMainKeyValidatorImpl mainKeyValidator;
static {
@ -220,13 +201,11 @@ public class BeanInfo {
}
public static BeanInfo getBeanInfo(Class<? extends BaseBean> cls) {
BeanInfo info = beanInfos.get(cls);
return info;
return beanInfos.get(cls);
}
public static BeanInfo getBeanInfo(String name) {
BeanInfo info = nameMapBeanInfos.get(name);
return info;
return nameMapBeanInfos.get(name);
}
public static Class<? extends BaseBean> getSuperClass(Class<? extends BaseBean> cls) {

@ -23,7 +23,7 @@ public class BeanRelation {
}
}
private static Map<Long, BeanRelation> relations = new ConcurrentHashMap<>();
private static final Map<Long, BeanRelation> relations = new ConcurrentHashMap<>();
private static BeanRelation get() {
Long userId = 0L;
BeanRelation relation = relations.get(userId);
@ -214,8 +214,8 @@ public class BeanRelation {
return result;
}
private final static <T extends BaseBean> boolean lastListImpl(List<T> result, BaseBean bean, BaseBean self, Predicate<T> pred,
Enum<?>[] holders, int index) {
private static <T extends BaseBean> boolean lastListImpl(List<T> result, BaseBean bean, BaseBean self, Predicate<T> pred,
Enum<?>[] holders, int index) {
if (index >= holders.length) {
if (self == bean) {
return false;
@ -270,10 +270,6 @@ public class BeanRelation {
/**
*
*
* @param bean
* @param holder
* @param relaBean
*/
public static void set(BaseBean bean, Enum<?> holder, BaseBean relaBean) {
if (bean == null || holder == null) {
@ -309,11 +305,6 @@ public class BeanRelation {
/**
*
*
* @param bean
* @param holder
* @param relaBean
* @param reverseHolder
*/
private static void setImpl(BaseBean bean, Enum<?> holder, BaseBean relaBean, Enum<?> reverseHolder) {
get(bean).get(holder).add(relaBean);
@ -324,8 +315,6 @@ public class BeanRelation {
/**
*
*
* @param bean
*/
public static void remove(BaseBean bean) {
if (bean == null) {
@ -342,9 +331,6 @@ public class BeanRelation {
/**
*
*
* @param bean
* @param holder
*/
public static void remove(BaseBean bean, Enum<?> holder) {
if (bean == null || holder == null) {
@ -365,10 +351,6 @@ public class BeanRelation {
/**
*
*
* @param bean
* @param holder
* @param relaBean
*/
public static void remove(BaseBean bean, Enum<?> holder, BaseBean relaBean) {
if (bean == null || holder == null) {
@ -384,7 +366,6 @@ public class BeanRelation {
/**
*
* @param bean
*/
public static void erase(BaseBean bean) {
get().caches.get(bean.getClass()).remove(bean.getId());
@ -392,10 +373,6 @@ public class BeanRelation {
/**
* lambdalambdafalse退
* @param bean
* @param fun
* @param holders
* @param <T>
*/
public static <T extends BaseBean> void recursion(BaseBean bean, Predicate<T> fun, Enum<?>... holders) {
if (holders.length == 0) {
@ -406,14 +383,9 @@ public class BeanRelation {
/**
* 广
* @param bean
* @param fun
* @param holders
* @param index
* @param <T>
*/
private final static <T extends BaseBean> void recursionImpl(BaseBean bean, Predicate<T> fun,
Enum<?>[] holders, int index) {
private static <T extends BaseBean> void recursionImpl(BaseBean bean, Predicate<T> fun,
Enum<?>[] holders, int index) {
if (index >= holders.length) {
if (!fun.test((T) bean)) {
return;
@ -423,7 +395,7 @@ public class BeanRelation {
List<BaseBean> relaBeans = list(bean, holders[index]);
for (BaseBean relaBean : relaBeans) {
if (relaBean.getId() != bean.getId()) {
if (!relaBean.getId().equals(bean.getId())) {
recursionImpl(relaBean, fun, holders, index + 1);
}
}

@ -9,7 +9,6 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.io.InputStream;
import java.net.JarURLConnection;
@ -24,11 +23,7 @@ public class BeanRelationUtil {
static class XMLReader extends DefaultHandler {
private BeanInfo firstInfo = null;
private Enum<?> firstHolder = null;
private BeanInfo secondInfo = null;
private Enum<?> secondHolder = null;
private RELATION_TYPE type = RELATION_TYPE.INVALID;
private boolean owner = false;
public void startElement(String uri, String localName, String nodeName, Attributes attributes) throws SAXException {
if (nodeName.equalsIgnoreCase("Class")) {
final String name = attributes.getValue("name");
@ -49,8 +44,8 @@ public class BeanRelationUtil {
if (firstSignName == null) {
throw new SAXException("Relation节点缺少field属性");
}
this.firstHolder = this.firstInfo.getHolder(firstSignName);
if (this.firstHolder == null) {
Enum<?> firstHolder = this.firstInfo.getHolder(firstSignName);
if (firstHolder == null) {
throw new SAXException("未定义枚举标识" + firstSignName);
}
@ -58,46 +53,44 @@ public class BeanRelationUtil {
if (secondFactoryName == null) {
throw new SAXException("Relation节点缺少name属性");
}
this.secondInfo = BeanInfo.getBeanInfo(secondFactoryName);
if (this.secondInfo == null) {
BeanInfo secondInfo = BeanInfo.getBeanInfo(secondFactoryName);
if (secondInfo == null) {
throw new SAXException("未找到" + secondFactoryName + "的类定义");
}
String secondSignName = attributes.getValue("reverse");
Enum<?> secondHolder = null;
if (secondSignName != null) {
this.secondHolder = this.secondInfo.getHolder(secondSignName);
if (this.secondHolder == null) {
secondHolder = secondInfo.getHolder(secondSignName);
if (secondHolder == null) {
throw new SAXException(secondFactoryName + "类未定义枚举标识" + secondSignName);
}
} else {
this.secondHolder = null;
}
String typeName = attributes.getValue("type");
if (typeName == null) {
throw new SAXException("Relation节点缺少type属性");
}
this.type = RELATION_TYPE.valueOf(typeName);
RELATION_TYPE type = RELATION_TYPE.valueOf(typeName);
String ownerName = attributes.getValue("owner");
if (ownerName == null) {
this.owner = false;
} else {
this.owner = ownerName.equalsIgnoreCase("true") ? true : false;
boolean owner = false;
if (ownerName != null) {
owner = ownerName.equalsIgnoreCase("true");
}
RelationInfo firstData = this.getSignData(firstInfo, this.firstHolder);
firstData.setBeanInfo(this.secondInfo);
firstData.setType(this.type);
firstData.setOwner(this.owner);
firstData.setReverseHolder(this.secondHolder);
RelationInfo firstData = this.getSignData(firstInfo, firstHolder);
firstData.setBeanInfo(secondInfo);
firstData.setType(type);
firstData.setOwner(owner);
firstData.setReverseHolder(secondHolder);
if (this.secondHolder != null) {
RelationInfo secondData = this.getSignData(secondInfo, this.secondHolder);
if (secondHolder != null) {
RelationInfo secondData = this.getSignData(secondInfo, secondHolder);
secondData.setBeanInfo(this.firstInfo);
secondData.setOwner(false);
secondData.setReverseHolder(this.firstHolder);
switch (this.type) {
secondData.setReverseHolder(firstHolder);
switch (type) {
case MULTI_TO_MULTI:
secondData.setType(RELATION_TYPE.MULTI_TO_MULTI);
break;
@ -165,8 +158,7 @@ public class BeanRelationUtil {
}
}
}
} catch (IOException e) {
return;
} catch (IOException ignored) {
}
}
@ -176,13 +168,10 @@ public class BeanRelationUtil {
return;
}
File[] dirFiles = dir.listFiles(new FileFilter() {
@Override
public boolean accept(File file) {
return file.isDirectory() || file.getName().endsWith(".xml");
}
});
File[] dirFiles = dir.listFiles(file -> file.isDirectory() || file.getName().endsWith(".xml"));
if (dirFiles == null) {
return;
}
for (File file : dirFiles) {
if (file.isDirectory()) {
@ -190,7 +179,7 @@ public class BeanRelationUtil {
} else {
try {
loadXMLConfigure(file.getCanonicalPath());
} catch (IOException e) {
} catch (IOException ignored) {
}
}
}
@ -215,33 +204,30 @@ public class BeanRelationUtil {
/**
* xml
* @param xmlPath
*/
private static void loadXMLConfigure(String xmlPath) {
SAXParserFactory sf = SAXParserFactory.newInstance();
try {
SAXParser sp = sf.newSAXParser();
sp.parse(new InputSource(xmlPath), new XMLReader());
} catch (ParserConfigurationException | SAXException | IOException e) {
} catch (ParserConfigurationException | SAXException | IOException ignored) {
}
}
/**
* jarxml
* @param is
*/
private static void loadXMLConfigure(InputStream is) {
SAXParserFactory sf = SAXParserFactory.newInstance();
try {
SAXParser sp = sf.newSAXParser();
sp.parse(new InputSource(is), new XMLReader());
} catch (ParserConfigurationException | SAXException | IOException e) {
} catch (ParserConfigurationException | SAXException | IOException ignored) {
}
}
/**
*
* @param packName
*/
public static List<Class<?>> loadClass(String packName) {
List<Class<?>> clses = new ArrayList<>();
@ -274,13 +260,10 @@ public class BeanRelationUtil {
return;
}
File[] dirFiles = dir.listFiles(new FileFilter() {
@Override
public boolean accept(File file) {
return file.isDirectory() || file.getName().endsWith(".class");
}
});
File[] dirFiles = dir.listFiles(file -> file.isDirectory() || file.getName().endsWith(".class"));
if (dirFiles == null) {
return;
}
for (File file : dirFiles) {
if (file.isDirectory()) {

@ -20,7 +20,7 @@ public class CustomDateDeserializer extends JsonDeserializer<Date> {
if (!StringUtils.isEmpty(text)) {
try {
return DATETIME_FORMATOR.parse(text);
} catch (ParseException e) {
} catch (ParseException ignored) {
}
}
return null;

@ -9,5 +9,7 @@ package cn.estsh.i3plus.pojo.aps.holders;
**/
public enum EResource {
WorkShop,
WorkPlans
WorkPlans,
BindResource,
SubBindResources,
}

@ -7,9 +7,6 @@ public class APSDoubleTool {
/**
*
* @param value
* @param pric
* @return
*/
public static double ceilPric(double value, int pric) {
final double digits = Math.pow(10.0, pric);

@ -4,4 +4,6 @@
</Relation>
<Relation field="WorkPlans" name="WorkPlan" reverse="Resource" type="ONE_TO_MULTI" owner="true">
</Relation>
<Relation field="BindResource" name="Resource" reverse="SubBindResources" type="MULTI_TO_ONE">
</Relation>
</Class>

@ -1148,7 +1148,8 @@ public class ApsEnumUtil {
PURCHASE_ORDER("PURCHASE_ORDER", "P", "采购订单"),
INVENTORY("INVENTORY", "W", "库存订单"),
SAFE_STOCK_ORDER("SAFE_STOCK_ORDER", "Q", "安全库存订单"),
INSERTED_ORDER("INSERTED_ORDER", "I", "插单");
INSERTED_ORDER("INSERTED_ORDER", "I", "插单"),
SUPPLY_ORDER("SUPPLY_ORDER", "Z", "补充订单");
private final String value;
private final String prefix;

@ -128,7 +128,7 @@ public class BlockSoftSwitchEnumUtil {
// CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"),
CLIENT_WEB_SERVICE_PARAM_OBJECT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140004,"Client Param Object"),
CLIENT_WEB_SERVICE_HUAYU(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140005,"Client 华域的设置"),
/* 数据源 */
CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),

@ -4961,7 +4961,8 @@ public class WmsEnumUtil {
PLANNED_PULL(40, "计划拉动"),
ANDON_PULL(50, "安灯拉动"),
EXTERNAL_PULL(60, "手工拉动"),
WORKORDER_PULL(70, "工单拉动");
WORKORDER_PULL(70, "工单拉动"),
OVER_PULL(80, "过点拉动");
private int value;
private String description;

@ -0,0 +1,28 @@
package cn.estsh.i3plus.pojo.bsp.server.bean.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : Castle
* @CreateDate : 2021/9/8 17:41
* @Modify:
**/
@Data
@ApiModel("方法回到")
public class HandleCallBackParam implements Serializable {
private static final long serialVersionUID = 42L;
@ApiModelProperty(name = "日志ID")
private long logId;
@ApiModelProperty(name = "成功失败标志1成功2失败")
private int handleCode;
@ApiModelProperty(name = "方法执行日志")
private String handleMsg;
}

@ -25,4 +25,6 @@ public class RequestModel {
private String methodHandlerKey;
@ApiModelProperty("方法的入参")
private Map<String, Object> jsonParamMap;
@ApiModelProperty("日志id")
private Long logId;
}

@ -0,0 +1,50 @@
package cn.estsh.i3plus.pojo.bsp.server.bean.po;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.thoughtworks.xstream.converters.extended.NamedMapConverter;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : Castle
* @CreateDate : 2021/9/8 17:01
* @Modify:
**/
@Table(name = "METHOD_LOG")
@Entity
@Data
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
@ApiModel("方法调用日志")
public class MethodLog extends BaseBean implements Serializable {
@ApiModelProperty("调用方法名冗余字段")
@Column(name = "METHOD_NAME_RDD")
private String methodNameRdd;
@ApiModelProperty("方法id")
@Column(name = "METHOD_ID")
private Long methodId;
@ApiModelProperty("方法参数")
@Column(name = "METHOD_PARAMS")
private String methodParam;
@ApiModelProperty("方法调用日志信息")
@Column(name = "MESSAGE",columnDefinition = " text ")
private String message;
@ApiModelProperty("方法是否执行成功")
@Column(name = "SUCCESS")
private Integer success;
}

@ -0,0 +1,39 @@
package cn.estsh.i3plus.pojo.bsp.server.bean.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Description :Dashboard
* @Reference :
* @Author : Castle
* @CreateDate : 2021/9/8 14:44
* @Modify:
**/
@ApiModel("Dashboard数据")
@Data
public class DashboardSummaryVo {
@ApiModelProperty("总方法数")
private Integer totalMethodNum;
@ApiModelProperty("启用方法数")
private Integer enableMethodNum;
@ApiModelProperty("禁用方法数")
private Integer disableMethodNum;
@ApiModelProperty("总应用数")
private Integer totalAppNum;
@ApiModelProperty("启用应用数")
private Integer enableAppNum;
@ApiModelProperty("禁用方法数")
private Integer disableAppNum;
@ApiModelProperty("总实例数")
private Integer totalInstanceNum;
@ApiModelProperty("启动实例数")
private Integer enableInstanceNum;
@ApiModelProperty("禁用实例数")
private Integer disableInstanceNum;
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.bsp.server.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.bsp.server.bean.po.MethodLog;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : Castle
* @CreateDate : 2021/9/8 17:13
* @Modify:
**/
@Repository
public interface MethodLogRepository extends BaseRepository<MethodLog,Long> {
}

@ -5,8 +5,6 @@ import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
@ -41,6 +39,11 @@ import java.util.List;
public class MesWorkOrder extends BaseBean implements Serializable {
private static final long serialVersionUID = -3566003375267865064L;
@Column(name = "SYSTEM_SYNC_STATUS")
@ColumnDefault("2")
@ApiParam(value = "系统同步标志")
public Integer systemSyncStatus = 2;
@Column(name = "ORDER_NO", nullable = false)
@ApiParam("工单号")
private String orderNo;
@ -440,8 +443,6 @@ public class MesWorkOrder extends BaseBean implements Serializable {
private Integer ngQty;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

@ -214,6 +214,9 @@ public class StationRequestBean implements Serializable {
@ApiParam("密码")
private String password;
@ApiParam("缓存来源文件")
private String cacheSourceClass;
public StationRequestBean() {
}
@ -252,6 +255,7 @@ public class StationRequestBean implements Serializable {
", finishCount=" + finishCount +
", packageNo=" + packageNo +
", createDatetime=" + createDatetime +
", cacheSourceClass=" + cacheSourceClass +
'}';
}
}

@ -102,4 +102,4 @@
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>
</project>

@ -0,0 +1,25 @@
package cn.estsh.i3plus.pojo.model.platform;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole;
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @author ns
* @create 2021/11/3 0003 17:31
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("用户角色关联model")
public class SysRoleModel implements Serializable {
private SysRole sysRole;
private Pager pager;
}

@ -131,9 +131,6 @@ public class WmsActionResponseBean<Obj> implements Serializable {
@ApiParam(value = "是否重置")
private Integer isReset;
// @ApiParam(value = "任务编号")
// private String taskNo;
public WmsActionResponseBean(Boolean codeStatus, String message) {
this.codeStatus = codeStatus;
this.message = message;

@ -0,0 +1,26 @@
package cn.estsh.i3plus.pojo.platform.bean;
import io.swagger.annotations.Api;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : Castle
* @CreateDate : 2021/9/23 13:59
* @Modify:
**/
@Data
@Api(value = "冷热分离消息")
public class DataSeparatorMessage implements Serializable {
private static final long serialVersionUID = -1;
private Long id;
private String refClass;
}

@ -986,7 +986,9 @@ public class CoreHqlPack {
// hql拼接
DdlPreparedPack.getStringLikerPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean);
DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean);
// DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean);
//2021-10-19 修改成模糊查询
DdlPreparedPack.getStringLikerPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean);
DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateGroupId(), "templateGroupId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateSoftType(), "templateSoftType", ddlPackBean);
@ -1340,4 +1342,4 @@ public class CoreHqlPack {
return ddlPackBean;
}
}
}

@ -216,6 +216,9 @@ public class WmsDocFgDetail extends BaseBean {
@ApiParam(value = "产品条码")
private String serialNumber;
@Column(name = "IS_GENERATE_PICKING", columnDefinition = "int default 2")
@ApiParam("是否已经生成领料单")
public Integer isGeneratePicking;

@ -180,4 +180,18 @@ public class WmsQCMaster extends BaseBean {
this.partNameRdd = partNameRdd;
this.createDatetime = createDatetime;
}
public WmsQCMaster(String orderNo,String refSrc,String remark,String vendorNo,String vendorDesc,String partNo,String partNameRdd,Double qty,Integer orderStatus,Integer qcStatus,String createDatetime) {
this.orderNo = orderNo;
this.refSrc = refSrc;
this.remark = remark;
this.vendorNo = vendorNo;
this.vendorDesc = vendorDesc;
this.partNo = partNo;
this.qty = qty;
this.orderStatus = orderStatus;
this.partNameRdd = partNameRdd;
this.qcStatus = qcStatus;
this.createDatetime = createDatetime;
}
}

Loading…
Cancel
Save