I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo

Browse Source
yun-zuoyi
许心洁 6 years ago
parent 7a403a37da 232c675444
commit 1e41ab2e39
104 changed files with 1266 additions and 319 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
Unescape Escape View File

@ -392,7 +392,7 @@ public class AndonManageQueue extends BaseBean {
* @param workCellCode
* @param workCellNameRdd
* @param alarmCode
* @param ecCode
* @param ecCodec
* @param ecNameRdd
* @param emCode
* @param emNameRdd

4
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java
Unescape Escape View File

@ -268,6 +268,10 @@ public class AndonManageRecord extends BaseBean {
@ApiParam(value = "放行说明")
private String openInfo;
@Column(name = "SIGN_SEND_FLAG")
@ApiParam(value = "响应已通知标识")
private String signSendFlag;
// 是否转呼
public Integer getIsShiftCall() {
return this.isShiftCall == null ? 0 : this.isShiftCall;

5
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
Unescape Escape View File

@ -163,7 +163,7 @@ public class AndonHqlPack {
*/
public static DdlPackBean packHqlMesWorkCell(MesWorkCell mesWorkCell){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(mesWorkCell.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result);
getStringBuilderPack(mesWorkCell, result);
@ -267,7 +267,7 @@ public class AndonHqlPack {
*/
public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue, Object[] obj){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result);
@ -462,6 +462,7 @@ public class AndonHqlPack {
DdlPreparedPack.getStringEqualPack(responseCfg.getRpLevel(), "rpLevel", result);
DdlPreparedPack.getStringEqualPack(responseCfg.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(responseCfg.getRpObjectCode(), "rpObjectCode", result);
DdlPreparedPack.getStringEqualPack(responseCfg.getOrganizeCode(), "organizeCode", result);
getStringBuilderPack(responseCfg, result);

16
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
Unescape Escape View File

@ -5,11 +5,13 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import java.util.Date;
import java.util.List;
@ -21,6 +23,7 @@ import java.util.List;
* @Modify:
**/
@Data
@MappedSuperclass
@Api("订单基类")
public class BaseOrder extends BaseCode {
@Column(name="COUNT")
@ -31,12 +34,12 @@ public class BaseOrder extends BaseCode {
@ApiParam(value ="优先级")
private Integer priority;
@Column(name="最晚结束时刻")
@ApiParam(value ="工作筛选")
@Column(name="LET")
@ApiParam(value ="最晚结束时刻")
private Date let;
@Column(name="最早开始时刻计算值")
@ApiParam(value ="工作筛选")
@Column(name="CALC_EST")
@ApiParam(value ="最早开始时刻计算值")
private Date calcEst;
@Column(name="CALC_LET")
@ -60,6 +63,7 @@ public class BaseOrder extends BaseCode {
@FieldAnnotation(property = false)
private Long materialId;
@JsonBackReference
public List<Work> getWorks() {
return BeanRelation.list(this, EBaseOrder.Works);
}
@ -73,18 +77,22 @@ public class BaseOrder extends BaseCode {
BeanRelation.set(this, EBaseOrder.Material, material);
}
@JsonBackReference
public List<WorkRelation> getPrevRelations() {
return BeanRelation.list(this, EBaseOrder.PrevRelations);
}
@JsonBackReference
public List<WorkRelation> getPostRelations() {
return BeanRelation.list(this, EBaseOrder.PostRelations);
}
@JsonBackReference
public List<BaseOrder> getUpperOrders() {
return BeanRelation.list(this, EBaseOrder.UpperOrders);
}
@JsonBackReference
public List<BaseOrder> getLowerOrders() {
return BeanRelation.list(this, EBaseOrder.LowerOrders);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EExportProject;
import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -45,6 +46,7 @@ public class ExportProject extends BaseAPS {
BeanRelation.set(this, EExportProject.Link, link);
}
@JsonBackReference
public List<ExportDetail> getDetails() {
return BeanRelation.list(this, EExportProject.Details);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EImportProject;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -43,6 +44,7 @@ public class ImportProject extends BaseAPS {
BeanRelation.set(this, EImportProject.Link, link);
}
@JsonBackReference
public List<ImportDetail> getDetails() {
return BeanRelation.list(this, EImportProject.Details);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -38,6 +39,7 @@ public class Inventory extends BaseOrder {
@ApiParam(value ="多余量")
private Double excessCount;
@JsonIgnore
public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works);
}

8
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
Unescape Escape View File

@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.enums.MATERIAL_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.PREPARE_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.REPLENISHMENT_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EMaterial;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -107,30 +108,37 @@ public class Material extends BaseCode {
@ApiParam(value ="最大库存数量")
private Double maxStockCount;
@JsonBackReference
public List<ProductRouting> getProductRoutings() {
return BeanRelation.list(this, EMaterial.ProductRoutings);
}
@JsonBackReference
public List<OperInput> getOperInputs() {
return BeanRelation.list(this, EMaterial.OperInputs);
}
@JsonBackReference
public List<OperOutput> getOperOutputs() {
return BeanRelation.list(this, EMaterial.OperOutputs);
}
@JsonBackReference
public List<WorkInput> getWorkInputs() {
return BeanRelation.list(this, EMaterial.WorkInputs);
}
@JsonBackReference
public List<WorkOutput> getWorkOutputs() {
return BeanRelation.list(this, EMaterial.WorkOutputs);
}
@JsonBackReference
public List<WorkRelation> getWorkRelations() {
return BeanRelation.list(this, EMaterial.WorkRelations);
}
@JsonBackReference
public List<BaseOrder> getOrders() {
return BeanRelation.list(this, EMaterial.Orders);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
Unescape Escape View File

@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EOperInput;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -78,6 +79,7 @@ public class OperInput extends BaseAPS {
BeanRelation.set(this, EOperInput.Material, material);
}
@JsonBackReference
public List<WorkInput> getWorkInputs() {
return BeanRelation.list(this, EOperInput.WorkInputs);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EOperOutput;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -65,6 +66,7 @@ public class OperOutput extends BaseAPS {
BeanRelation.set(this, EOperOutput.Material, material);
}
@JsonBackReference
public List<WorkOutput> getWorkOutputs() {
return BeanRelation.list(this, EOperOutput.WorkOutputs);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
Unescape Escape View File

@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EOperResource;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -86,6 +87,7 @@ public class OperResource extends BaseAPS {
BeanRelation.set(this, EOperResource.Resource, res);
}
@JsonBackReference
public List<WorkResource> getWorkResources() {
return BeanRelation.list(this, EOperResource.WorkResources);
}

11
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
Unescape Escape View File

@ -6,10 +6,10 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL;
import cn.estsh.i3plus.pojo.aps.holders.EOperation;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.springframework.context.annotation.Bean;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -96,15 +96,18 @@ public class Operation extends BaseAPS {
BeanRelation.set(this, EOperation.ProductRouting, routing);
}
@JsonBackReference
public List<OperInput> getOperInputs() {
return BeanRelation.list(this, EOperation.OperInputs);
}
@JsonBackReference
public List<OperOutput> getOperOutputs() {
return BeanRelation.list(this, EOperation.OperOutputs);
}
public List<Resource> getOperResources() {
@JsonBackReference
public List<OperResource> getOperResources() {
return BeanRelation.list(this, EOperation.OperResources);
}
@ -116,8 +119,4 @@ public class Operation extends BaseAPS {
this.standOperationId = std != null ? std.getId() : 0l;
BeanRelation.set(this, EOperation.StandOperation, std);
}
public List<Work> getWorks() {
return BeanRelation.list(this, EOperation.Works);
}
}

67
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java
Unescape Escape View File

@ -0,0 +1,67 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EParentWork;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.List;
/**
* @Description :父工作
* 父工作用于记录工作分割前的信息。
* 生产订单应关联父工作，父工作关联多个工作。
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_PARENT_WORK")
@Api("父工作")
public class ParentWork extends BaseAPS {
@Column(name="count")
@ApiParam(value ="数量")
private Double count;
@Column(name="PRODUCT_ORDER_ID")
@ApiParam(value ="订单")
@FieldAnnotation(property = false)
private Long productOrderId;
@Column(name="OPERATION_ID")
@ApiParam(value ="工序")
@FieldAnnotation(property = false)
private Long operationId;
public BaseOrder getProductOrder() {
return BeanRelation.get(this, EParentWork.ProductOrder);
}
public void setProductOrder(ProductOrder order) {
this.productOrderId = order != null ? order.getId() : 0l;
BeanRelation.set(this, EParentWork.ProductOrder, order);
}
public Operation getOperation() {
return BeanRelation.get(this, EParentWork.Operation);
}
public void setOperation(Operation oper) {
this.operationId = oper != null ? oper.getId() : 0l;
BeanRelation.set(this, EParentWork.Operation, oper);
}
@JsonBackReference
public List<Work> getWorks() {
return BeanRelation.list(this, EParentWork.Works);
}
}

9
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EProductOrder;
import cn.estsh.i3plus.pojo.aps.holders.EProductRouting;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -12,6 +13,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
import java.util.List;
/**
* @Description :生产订单
@ -85,6 +87,10 @@ public class ProductOrder extends BaseOrder {
@ApiParam(value ="缺少量")
private Double lackCount;
@Column(name="AUTO_SUPPLY")
@ApiParam(value ="物料计算时自动补充")
private Boolean autoSupply;
@Column(name="PRODUCT_ROUTING_ID")
@ApiParam(value ="工艺路线")
@FieldAnnotation(property = false)
@ -98,4 +104,7 @@ public class ProductOrder extends BaseOrder {
this.productRoutingId = routing != null ? routing.getId() : 0l;
BeanRelation.set(this, EProductOrder.ProductRouting, routing);
}
@JsonBackReference
public List<ParentWork> getParentWorks() { return BeanRelation.list(this, EProductOrder.ParentWorks); }
}

3
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EProductRouting;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -52,10 +53,12 @@ public class ProductRouting extends BaseCode {
BeanRelation.set(this, EProductRouting.Material, material);
}
@JsonBackReference
public List<Operation> getOperations() {
return BeanRelation.list(this, EProductRouting.Operations);
}
@JsonBackReference
public List<ProductOrder> getProductOrders() {
return BeanRelation.list(this, EProductRouting.ProductOrders);
}

6
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -46,6 +47,11 @@ public class PurchaseOrder extends BaseOrder {
@ApiParam(value ="多余量")
private Double excessCount;
@Column(name="AUTO_SUPPLY")
@ApiParam(value ="物料计算时自动补充")
private Boolean autoSupply;
@JsonIgnore
public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -43,6 +44,7 @@ public class SalesOrder extends BaseOrder {
@ApiParam(value ="提前期计算值")
private String calcLeadTime;
@JsonIgnore
public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works);
}

39
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
Unescape Escape View File

@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.WORK_STATUS;
import cn.estsh.i3plus.pojo.aps.enums.WORK_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EWork;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -106,6 +107,11 @@ public class Work extends BaseCode {
@FieldAnnotation(property = false)
private Long operationId;
@Column(name="PARENT_WORK_ID")
@ApiParam(value ="父工作")
@FieldAnnotation(property = false)
private Long parentWorkId;
public BaseOrder getOrder() {
return BeanRelation.get(this, EWork.Order);
}
@ -115,35 +121,50 @@ public class Work extends BaseCode {
BeanRelation.set(this, EWork.Order, order);
}
public Operation getOperation() {
return BeanRelation.get(this, EWork.Operation);
}
public void setOperation(Operation oper) {
this.operationId = oper != null ? oper.getId() : 0l;
BeanRelation.set(this, EWork.Operation, oper);
}
public ParentWork getParentWork() {
return BeanRelation.get(this, EWork.ParentWork);
}
public void setParentWork(ParentWork parentWork) {
this.parentWorkId = parentWork != null ? parentWork.getId() : 0l;
BeanRelation.set(this, EWork.ParentWork, parentWork);
}
@JsonBackReference
public List<WorkResource> getWorkResources() {
return BeanRelation.list(this, EWork.WorkResources);
}
@JsonBackReference
public List<WorkInput> getWorkInputs() {
return BeanRelation.list(this, EWork.WorkInputs);
}
@JsonBackReference
public List<WorkOutput> getWorkOutputs() {
return BeanRelation.list(this, EWork.WorkOutputs);
}
@JsonBackReference
public List<WorkRelation> getWorkRelationInputs() {
return BeanRelation.list(this, EWork.WorkRelationInputs);
}
@JsonBackReference
public List<WorkRelation> getWorkRelationOutputs() {
return BeanRelation.list(this, EWork.WorkRelationOutputs);
}
public Operation getOperation() {
return BeanRelation.get(this, EWork.Operation);
}
public void setOperation(Operation oper) {
this.operationId = oper != null ? oper.getId() : 0l;
BeanRelation.set(this, EWork.Operation, oper);
}
@JsonBackReference
public List<PlanFeedback> getPlanFeedbacks() {
return BeanRelation.list(this, EWork.PlanFeedbacks);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EWorkInput;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -62,6 +63,7 @@ public class WorkInput extends BaseAPS {
BeanRelation.set(this, EWorkInput.Work, work);
}
@JsonBackReference
public List<WorkRelation> getWorkRelations() {
return BeanRelation.list(this, EWorkInput.WorkRelations);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EWorkOutput;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -63,6 +64,7 @@ public class WorkOutput extends BaseAPS {
BeanRelation.set(this, EWorkOutput.Work, work);
}
@JsonBackReference
public List<WorkRelation> getWorkRelations() {
return BeanRelation.list(this, EWorkOutput.WorkRelations);
}

40
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import java.util.*;
import java.util.function.Consumer;
public class BeanInfo {
private Class<? extends BaseBean> cls;
@ -103,6 +104,14 @@ public class BeanInfo {
return null;
}
public Class<? extends BaseBean> getRelationClass(Enum<?> holder) {
RelationInfo relaInfo = getRelationInfo(holder);
if (relaInfo != null) {
return relaInfo.getBeanInfo().getBeanClass();
}
return null;
}
public RELATION_TYPE getRelationType(Enum<?> holder) {
RelationInfo relaInfo = getRelationInfo(holder);
if (relaInfo != null) {
@ -120,31 +129,40 @@ public class BeanInfo {
return RELATION_TYPE.INVALID;
}
public List<Enum<?>> getAllHolders() {
List<Enum<?>> holders = new ArrayList<>();
private void foreach(Consumer<RelationInfo> fun) {
for (Map.Entry<Enum<?>, RelationInfo> entry : relations.entrySet()) {
holders.add(entry.getKey());
fun.accept(entry.getValue());
}
if (this.superBeanInfo != null) {
this.superBeanInfo.foreach(fun);
}
}
public List<Enum<?>> getAllHolders() {
List<Enum<?>> holders = new ArrayList<>();
foreach((RelationInfo info)->{
holders.add(info.getHolder());
});
return holders;
}
public List<Enum<?>> getOwnerHolders() {
List<Enum<?>> owners = new ArrayList<>();
for (Map.Entry<Enum<?>, RelationInfo> entry : relations.entrySet()) {
if (entry.getValue().isOwner()) {
owners.add(entry.getKey());
foreach((RelationInfo info)->{
if (info.isOwner()) {
owners.add(info.getHolder());
}
}
});
return owners;
}
public List<Enum<?>> getNormalSigns() {
List<Enum<?>> holders = new ArrayList<>();
for (Map.Entry<Enum<?>, RelationInfo> entry : relations.entrySet()) {
if (!entry.getValue().isOwner()) {
holders.add(entry.getKey());
foreach((RelationInfo info)->{
if (!info.isOwner()) {
holders.add(info.getHolder());
}
}
});
return holders;
}

16
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
Unescape Escape View File

@ -25,7 +25,7 @@ public class DateDuration {
public static final double PRECISION = 0.00001;
private String value;
private int time = 0;
private long time = 0;
private double rate = 0.0;
private boolean bValid = false;
@ -60,7 +60,7 @@ public class DateDuration {
* 对于无效的时间区间，返回0。单位为秒。
* @return
*/
public int getTime() {
public long getTime() {
return this.time;
}
@ -68,7 +68,7 @@ public class DateDuration {
* 设置新的时间区间。
* @return
*/
public void setTime(int time) {
public void setTime(long time) {
this.time = time;
}
@ -92,25 +92,25 @@ public class DateDuration {
return "0S";
}
int iMaxTimeUnit = 4;
long iMaxTimeUnit = 4;
StringBuffer strExtraString = new StringBuffer();
int extraTime = this.time;
long extraTime = this.time;
if (iMaxTimeUnit >= 4) {
int i = extraTime / 86400;
long i = extraTime / 86400;
if (i > 0) {
strExtraString.append(i).append("D");
}
extraTime -= i * 86400;
}
if (iMaxTimeUnit >= 3) {
int i = extraTime / 3600;
long i = extraTime / 3600;
if (i > 0) {
strExtraString.append(i).append("H");
}
extraTime -= i * 3600;
}
if (iMaxTimeUnit >= 2) {
int i = extraTime / 60;
long i = extraTime / 60;
if (i > 0) {
strExtraString.append(i).append("M");
}

3
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java
Unescape Escape View File

@ -10,5 +10,6 @@ package cn.estsh.i3plus.pojo.aps.enums;
public enum MATERIAL_TYPE {
PRODUCT, // 成品
HALF_PRODUCT, // 半成品
RAW_MATERIAL // 原材料
RAW_MATERIAL, // 原材料
VIRTUAL // 虚拟件
}

3
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java
Unescape Escape View File

@ -5,6 +5,5 @@ public enum EOperation {
OperInputs,
OperOutputs,
OperResources,
StandOperation,
Works
StandOperation
}

7
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java
Unescape Escape View File

@ -0,0 +1,7 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EParentWork {
ProductOrder,
Operation,
Works
}

3
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EProductOrder {
ProductRouting
ProductRouting,
ParentWorks
}

1
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.holders;
public enum EWork {
Order,
ParentWork,
WorkResources,
WorkInputs,
WorkOutputs,

9
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ParentWorkRepository.java
Unescape Escape View File

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.ParentWork;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface ParentWorkRepository extends CrudRepository<ParentWork, Long> {
}

2
modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml
Unescape Escape View File

@ -8,6 +8,4 @@
</Relation>
<Relation field="PostRelations" name="WorkRelation" reverse="PostOrder" type="ONE_TO_MULTI" owner="false">
</Relation>
<Relation field="UpperOrders" name="BaseOrder" reverse="LowerOrders" type="MULTI_TO_MULTI" owner="false">
</Relation>
</Class>

7
modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml
Unescape Escape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="ParentWork">
<Relation field="Operation" name="Operation" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="Works" name="Work" reverse="ParentWork" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

2
modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml
Unescape Escape View File

@ -1,3 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="ProductOrder" extends="BaseOrder">
<Relation field="ParentWorks" name="ParentWork" reverse="ProductOrder" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

2
modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
Unescape Escape View File

@ -10,7 +10,7 @@
</Relation>
<Relation field="WorkRelationInputs" name="WorkRelation" reverse="PostWork" type="ONE_TO_MULTI" owner="false">
</Relation>
<Relation field="Operation" name="Operation" reverse="Works" type="MULTI_TO_ONE" owner="false">
<Relation field="Operation" name="Operation" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="PlanFeedback" name="PlanFeedback" reverse="Work" type="ONE_TO_MULTI" owner="true">
</Relation>

122
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
Unescape Escape View File

@ -25,7 +25,8 @@ public class BlockSoftSwitchEnumUtil {
DATASOURCE(30,"数据源套件"),
WEB_SERVICE(40,"WebService套件"),
MQ(50,"消息队列套件"),
WEB_SOCKET(60,"WebSocket套件");
WEB_SOCKET(60,"WebSocket套件"),
FTP(70,"FTP套件");
private int value;
private String description;
@ -120,7 +121,8 @@ public class BlockSoftSwitchEnumUtil {
CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),
/* Restful */
CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test"),
CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client REST客户端适配器"),
SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,120001,"Client REST服务端适配器"),
/* Socket */
SERVER_SOCKET_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.SOCKET,210001,"Socket Server Hello测试服务"),
@ -128,7 +130,10 @@ public class BlockSoftSwitchEnumUtil {
/* MQ */
SERVER_MQ_RABBIT_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.MQ,250001,"RabbitMQ Server Hello测试服务"),
CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务");
CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务"),
/* FTP */
CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器");
private int value;
private String description;
@ -472,7 +477,9 @@ public class BlockSoftSwitchEnumUtil {
STRING(20,"字符串"),
BOOLEAN(30,"布尔"),
MAP(40,"字典"),
LIST(50,"列表");
LIST(50,"列表"),
JAVA_OBJECT(60,"Java Object"),
JAVA_DYNAMIC_OBJECT(61,"Java Dynamic Object");
private int value;
private String description;
@ -499,6 +506,21 @@ public class BlockSoftSwitchEnumUtil {
}
return tmp;
}
public static PARAM_VALUE_TYPE valueOfValueStr(String value){
PARAM_VALUE_TYPE result = PARAM_VALUE_TYPE.STRING;
try {
if(StringUtils.isNotBlank(value)){
for (int i = 0; i < values().length; i++) {
if (values()[i].value == Integer.parseInt(value)) {
return values()[i];
}
}
}
}catch (Exception e){
}
return result;
}
}
/**
@ -643,4 +665,96 @@ public class BlockSoftSwitchEnumUtil {
return tmp;
}
}
/**
* ftp传输编码
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FTP_ENCODE {
CONN_SUCCESS(10, "UTF-8", "UTF-8"),
CONN_FAILURE(20, "GBK", "GBK");
private int value;
private String encode;
private String description;
private FTP_ENCODE (int value,String encode, String description) {
this.value = value;
this.encode = encode;
this.description = description;
}
public int getValue() {
return value;
}
public String getEncode() {
return encode;
}
public String getDescription() {
return description;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].encode;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].encode.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
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;
}
public static FTP_ENCODE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String valueOfEncode(int value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
tmp = values()[i].encode;
}
}
return tmp;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].encode.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

71
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
Unescape Escape View File

@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
/**
* @Description :
@ -170,6 +169,14 @@ public class CommonEnumUtil {
public static String valueOfDescription(int val) {return valueOf(val);}
public static int descriptionOfValue(String desc) {return descOf(desc);}
public static boolean valueOfBoolean(int val) {
if(val == TRUE.value){
return true;
}else {
return false;
}
}
}
/**
@ -214,7 +221,7 @@ public class CommonEnumUtil {
EXCEPTION(2, "异常"),
EXCEPTION_DETAIL(3, "异常明细"),
EXCEPTION_SOLUTION(4, "解决方案"),
EXCEPTION_ENUM(5, "枚举"),
ENUM(5, "枚举"),
MODULE(10, "模块"),
METHOD(11, "功能"),
BUTTON(12, "按钮"),
@ -386,7 +393,67 @@ public class CommonEnumUtil {
return tmp;
}
}
/**
* 数据类型
* 1库存移动数据
* 2质检数据
* 3已配料待出库
* 4JIS发运扣减
* 5报工待汇总
* 6报工汇总待处理
* 7erp接口待同步
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NUM_TYPE {
MOVE_DETAILS(1, "MOVE_DETAILS", "库存移动数据"),
QC_DETAILS(2, "QC_DETAILS", "质检数据"),
DOC_MOVEMENT(3, "DOC_MOVEMENT", "已配料待出库"),
DOC_SHIPPING(4, "DOC_SHIPPING", "JIS发运扣减"),
FG_DETAILS(5, "FG_DETAILS", "报工待汇总"),
FG_SUM(6, "FG_SUM", "报工汇总待处理"),
ERP_INTERFACE(7, "ERP_INTERFACE", "ERP接口待同步");
private int value;
private String code;
private String description;
private NUM_TYPE(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 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;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum USER_INFO_STATUS {
INCUMBENT(1, "正常", "正常_NORMAL"),

14
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -905,7 +905,8 @@ public class MesEnumUtil {
STEP_CONTENT("stepContent", "工步内容"),
MODULE_CONTENT("moduleContent", "组件内容"),
CUSTOM_COMPONENT("customComponent", "定制内容"),
TASK_COMPLETE("taskComplete", "整个扫描完成");
TASK_COMPLETE("taskComplete", "整个扫描完成"),
RENEW_REQUEST_PARAMS("renewRequestParams","回传刷新StationResultBean");
private String value;
private String description;
@ -1242,11 +1243,12 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WC_CHECK_TYPE {
PERSON(10, "person", "人"),
EQUIPMENT(20, "equipment", "机"),
MATERIAL(30, "material", "料"),
ROUTE(40, "route", "法"),
ONLINE_SIGNAL(50, "onlineSignal", "开线信号");
PERSON(10, "person", "人员"),
EQUIPMENT(20, "equipment", "设备"),
MATERIAL(30, "material", "物料"),
ROUTE(40, "route", "工艺"),
ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号");
private int value;
private String code;

153
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -403,11 +403,13 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WC_CHECK_TYPE {
PERSON(10, "people", "人"),
PERSON(10, "people", "人员"),
EQUIPMENT(20, "equipments", "设备"),
MATERIAL(30, "materials", "物料"),
ROUTE(40, "routes", "工艺"),
ONLINE_SIGNAL(50, "onlineSignal", "开线信号");
ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号");
private int value;
private String code;
@ -620,10 +622,10 @@ public class MesPcnEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_TYPE {
SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),
SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"),
SOURCE_ORACLE(30, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null),
SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public");
SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null),
SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"),
SOURCE_ORACLE(30, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null),
SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public");
private int value;
private String code;
@ -632,7 +634,7 @@ public class MesPcnEnumUtil {
private int defaultPort;
private String defaultSchemaPattern;
private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) {
private DATA_SOURCE_TYPE(int value, String code, String description, String driverClassName, int port, String defaultSchemaPattern) {
this.value = value;
this.code = code;
this.description = description;
@ -715,47 +717,47 @@ public class MesPcnEnumUtil {
return tmp;
}
public String getJDBCUrl(String database,String host,Integer port){
if(this.getValue() == SOURCE_MARIA_DB.getValue()){
return getJDBCUrlMySQL(database,host,port);
}else if(this.getValue() == SOURCE_ORACLE.getValue()){
return getJDBCUrlOracle(database,host,port);
}else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){
return getJDBCUrlPostgreSQL(database,host,port);
}else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){
return getJDBCUrlSQLServer(database,host,port);
public String getJDBCUrl(String database, String host, Integer port) {
if (this.getValue() == SOURCE_MARIA_DB.getValue()) {
return getJDBCUrlMySQL(database, host, port);
} else if (this.getValue() == SOURCE_ORACLE.getValue()) {
return getJDBCUrlOracle(database, host, port);
} else if (this.getValue() == SOURCE_POSTGRE_SQL.getValue()) {
return getJDBCUrlPostgreSQL(database, host, port);
} else if (this.getValue() == SOURCE_SQL_SERVER.getValue()) {
return getJDBCUrlSQLServer(database, host, port);
}
return null;
}
public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
if(StringUtils.isNotBlank(databaseProductName)){
if(databaseProductName.indexOf(":mysql:") != -1){
public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName) {
if (StringUtils.isNotBlank(databaseProductName)) {
if (databaseProductName.indexOf(":mysql:") != -1) {
return SOURCE_MARIA_DB;
}else if(databaseProductName.indexOf(":oracle:") != -1){
} else if (databaseProductName.indexOf(":oracle:") != -1) {
return SOURCE_ORACLE;
}else if(databaseProductName.indexOf(":postgresql:") != -1){
} else if (databaseProductName.indexOf(":postgresql:") != -1) {
return SOURCE_POSTGRE_SQL;
}else if(databaseProductName.indexOf(":sqlserver:") != -1){
} else if (databaseProductName.indexOf(":sqlserver:") != -1) {
return SOURCE_SQL_SERVER;
}
}
return null;
}
private String getJDBCUrlMySQL(String database,String host,Integer port){
return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8";
private String getJDBCUrlMySQL(String database, String host, Integer port) {
return "jdbc:mysql://" + host + ":" + port + "/" + database + "?autoReconnect=true&useSSL=false&characterEncoding=utf-8";
}
private String getJDBCUrlOracle(String database,String host,Integer port){
return "jdbc:oracle:thin:@"+host+":"+port+":"+database;
private String getJDBCUrlOracle(String database, String host, Integer port) {
return "jdbc:oracle:thin:@" + host + ":" + port + ":" + database;
}
private String getJDBCUrlPostgreSQL(String database,String host,Integer port){
return "jdbc:postgresql://"+host+":"+port+"/"+database;
private String getJDBCUrlPostgreSQL(String database, String host, Integer port) {
return "jdbc:postgresql://" + host + ":" + port + "/" + database;
}
private String getJDBCUrlSQLServer(String database,String host,Integer port){
private String getJDBCUrlSQLServer(String database, String host, Integer port) {
return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database;
}
}
@ -1160,4 +1162,97 @@ public class MesPcnEnumUtil {
}
}
/**
* MesRoute 流程的类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_TYPE {
SCAN(10, "扫描流程"),
MONITOR(20, "监控流程");
private int value;
private String description;
ROUTE_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;
}
public static String valueOfDescription2(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
}
}
return tmp;
}
}
/**
* redis过期时间
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum EXPIRE_TIME {
NEVER(-1, "不过期"),
ONE_HOUR(3600, "一小时"),
ONE_MIN(60, "一分钟");
private int value;
private String description;
EXPIRE_TIME(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;
}
public static String valueOfDescription2(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
}
}
return tmp;
}
}
}

71
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -3351,7 +3351,10 @@ public class WmsEnumUtil {
public enum INVENTORY_DIFFERENCE_TYPE {
INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"),
INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"),
INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢");
INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"),
INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"),
INVENTORY_FIT(50, "INVENTORY_FIT", "库位一致"),
INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘");
private int value;
private String code;
@ -3576,6 +3579,15 @@ public class WmsEnumUtil {
}
return tmp;
}
public static PART_ASSOCIATE_TYPE codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
}
/**
@ -3633,4 +3645,61 @@ public class WmsEnumUtil {
}
}
/**
* 物流规则 处理模式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTING_RULE_MODE {
CREATE_TASK(10, "CREATE_TASK", "生成任务"),
AUTO_OPT(20, "AUTO_OPT", "自动操作"),
MENU_OPT(30, "MENU_OPT", "手工操作"),
AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易");
private int value;
private String code;
private String description;
ROUTING_RULE_MODE(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 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;
}
}
}

126
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import org.apache.commons.lang3.StringUtils;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
@ -47,8 +48,8 @@ public class DdlPreparedPack {
endDate += " 23:59:59";
}
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, startDate);
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, endDate);
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, startDate);
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, endDate);
}
/**
@ -94,9 +95,9 @@ public class DdlPreparedPack {
String[] time = date.split(",");
if (time.length == 1) {
//只有开始日期，没有结束日期
packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%");
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%");
} else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0)
|| (time[1] != null & time[1].trim().length() > 0))) {
|| (time[1] != null & time[1].trim().length() > 0))) {
if (time[0] == null || time[0].trim().length() == 0) {
time[0] = "1900-01-01";
} else {
@ -113,16 +114,16 @@ public class DdlPreparedPack {
if (isShowTime && time[1].trim().length() <= 11) {
time[1] += " 23:59:59";
}
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, time[0]);
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, time[1]);
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, time[0]);
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, time[1]);
} else {
if (showTaday) {
if (isShowTime) {
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today + " 00:00:00");
packBean.addColumnQuery("s_" + columnName," and model." + columnName + " <= :m_s_"+ columnName, today + " 23:59:59");
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, today + " 00:00:00");
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, today + " 23:59:59");
} else {
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today);
packBean.addColumnQuery("s_" + columnName," and model." + columnName + " <= :m_s_" + columnName, today);
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, today);
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, today);
}
}
}
@ -147,14 +148,14 @@ public class DdlPreparedPack {
}
if (!isShowTime) {
date = date.substring(0, 10);
packBean.addColumnQuery(null," and '" + date + "' between substring(model." + startColumnName
+ ",1,10) and substring(model." + endColumnName + ",1,10)", null);
packBean.addColumnQuery(null, " and '" + date + "' between substring(model." + startColumnName
+ ",1,10) and substring(model." + endColumnName + ",1,10)", null);
return;
} else if (date.trim().length() <= 11) {
date += " 00:00:00";
}
packBean.addColumnQuery(null," and '" + date + "' between model." + startColumnName
+ " and model." + endColumnName, null);
packBean.addColumnQuery(null, " and '" + date + "' between model." + startColumnName
+ " and model." + endColumnName, null);
}
/**
@ -173,9 +174,9 @@ public class DdlPreparedPack {
} else {
order[i] = "desc";
}
if(columnName[i].indexOf(" model.") == -1){
if (columnName[i].indexOf(" model.") == -1) {
sqlStr += " model." + columnName[i];
}else{
} else {
sqlStr += columnName[i];
}
sqlStr += " " + order[i].toString() + ",";
@ -209,7 +210,7 @@ public class DdlPreparedPack {
*/
public static void getStringLikerPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + val + "%");
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val + "%");
}
}
@ -222,7 +223,7 @@ public class DdlPreparedPack {
*/
public static void getStringLikerPackOr(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," or model." + columnName + " like :m_" + columnName, "%" + val + "%");
packBean.addColumnQuery(columnName, " or model." + columnName + " like :m_" + columnName, "%" + val + "%");
}
}
@ -235,7 +236,7 @@ public class DdlPreparedPack {
*/
public static void getStringRightLikerPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, val + "%");
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val + "%");
}
}
@ -248,7 +249,7 @@ public class DdlPreparedPack {
*/
public static void getStringLeftLikerPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + val);
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val);
}
}
@ -260,7 +261,7 @@ public class DdlPreparedPack {
*/
public static void getStringEqualPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, val);
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val);
}
}
@ -272,7 +273,7 @@ public class DdlPreparedPack {
*/
public static void getStringNoEqualPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, val);
packBean.addColumnQuery(columnName, " and model." + columnName + " <> :m_" + columnName, val);
}
}
@ -283,7 +284,7 @@ public class DdlPreparedPack {
* @param packBean
*/
public static void getStringNotNullPack(String columnName, DdlPackBean packBean) {
packBean.addColumnQuery(null," and model." + columnName + " is not null", null);
packBean.addColumnQuery(null, " and model." + columnName + " is not null", null);
}
/**
@ -294,7 +295,7 @@ public class DdlPreparedPack {
*/
public static void getStringEqualPackOr(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," or model." + columnName + " = :m_" + columnName, val);
packBean.addColumnQuery(columnName, " or model." + columnName + " = :m_" + columnName, val);
}
}
@ -306,7 +307,7 @@ public class DdlPreparedPack {
*/
public static void getNumEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Long.parseLong(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data);
}
}
@ -318,7 +319,7 @@ public class DdlPreparedPack {
*/
public static void getNegativeNumEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data);
}
}
@ -330,7 +331,7 @@ public class DdlPreparedPack {
*/
public static void getNumEqualPackOr(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Long.parseLong(data.toString()) > 0) {
packBean.addColumnQuery(columnName," or model." + columnName + " = :m_" + columnName, data);
packBean.addColumnQuery(columnName, " or model." + columnName + " = :m_" + columnName, data);
}
}
@ -342,7 +343,7 @@ public class DdlPreparedPack {
*/
public static void getNumEqualPackOverZero(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data);
}
}
@ -354,7 +355,7 @@ public class DdlPreparedPack {
*/
public static void getNumWithZeroEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) >= 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data);
}
}
@ -366,7 +367,7 @@ public class DdlPreparedPack {
*/
public static void getStringBiggerPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data);
}
}
@ -390,7 +391,7 @@ public class DdlPreparedPack {
*/
public static void getStringSmallerPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, data);
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, data);
}
}
@ -402,7 +403,7 @@ public class DdlPreparedPack {
*/
public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " < :m_s_" + columnName, data);
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " < :m_s_" + columnName, data);
}
}
@ -414,9 +415,22 @@ public class DdlPreparedPack {
*/
public static void getNumberBiggerPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " > :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data);
}
}
/**
* 封装double对象成大于语句
*
* @param columnName 列名
* @param packBean
*/
public static void getNumberBiggerPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data);
}
}
/**
* 封装double对象成大于等于语句
*
@ -425,7 +439,7 @@ public class DdlPreparedPack {
*/
public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data);
}
}
@ -437,9 +451,10 @@ public class DdlPreparedPack {
*/
public static void getNumberSmallerPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " < :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " < :m_" + columnName, data);
}
}
/**
* 封装double对象成小于等于语句
*
@ -448,7 +463,7 @@ public class DdlPreparedPack {
*/
public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " <= :m_" + columnName, data);
}
}
@ -460,7 +475,7 @@ public class DdlPreparedPack {
*/
public static void getNumNOEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " <> :m_" + columnName, data);
}
}
@ -473,7 +488,7 @@ public class DdlPreparedPack {
*/
public static void getInPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and model." + columnName + " in (:m_" + columnName + ")", data);
}
}
@ -486,7 +501,7 @@ public class DdlPreparedPack {
*/
public static void getOrInPack(String data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " or model." + columnName + " in (:m_" + columnName + ")", data);
}
}
@ -499,7 +514,7 @@ public class DdlPreparedPack {
*/
public static void getInPackArray(Object[] data, String columnName, DdlPackBean packBean) {
if (data != null && data.length > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data));
packBean.addColumnQuery(columnName, " and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data));
}
}
@ -512,7 +527,7 @@ public class DdlPreparedPack {
*/
public static void getNotInPackArray(Object[] data, String columnName, DdlPackBean packBean) {
if (data != null && data.length > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data));
packBean.addColumnQuery(columnName, " and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data));
}
}
@ -525,7 +540,7 @@ public class DdlPreparedPack {
*/
public static void getInPackList(List<?> data, String columnName, DdlPackBean packBean) {
if (data != null && data.size() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and model." + columnName + " in (:m_" + columnName + ")", data);
}
}
@ -538,7 +553,7 @@ public class DdlPreparedPack {
*/
public static void getNotInPackList(List<?> data, String columnName, DdlPackBean packBean) {
if (data != null && data.size() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + "not in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and model." + columnName + "not in (:m_" + columnName + ")", data);
}
}
@ -564,7 +579,7 @@ public class DdlPreparedPack {
data += "'" + dataArray[i] + "',";
}
}
packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " or model." + columnName + " in (:m_" + columnName + ")", data);
}
}
@ -590,7 +605,7 @@ public class DdlPreparedPack {
data += "'" + dataArray[i] + "',";
}
}
packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and " + columnName + " not in (:m_" + columnName + ")", data);
}
}
@ -603,26 +618,27 @@ public class DdlPreparedPack {
*/
public static void getNotInPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and " + columnName + " not in (:m_" + columnName + ")", data);
}
}
/**
* 转换排序列
*
* @param columnName 列名
* @param basisType 基本类型
* @see CommonEnumUtil.BASIS_TYPE
* @param basisType 基本类型
* @return
* @see CommonEnumUtil.BASIS_TYPE
*/
public static String getOrderColConvertType(String columnName,int basisType){
String name =" model." + columnName;
public static String getOrderColConvertType(String columnName, int basisType) {
String name = " model." + columnName;
if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) {
name = " cast(" + name+ " as integer)";
} else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()){
name = " cast(" + name+ " as double)";
} else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()){
name = " cast(" + name+ " as long)";
name = " cast(" + name + " as integer)";
} else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()) {
name = " cast(" + name + " as double)";
} else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()) {
name = " cast(" + name + " as long)";
}
return name;
}

2
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java
Unescape Escape View File

@ -26,7 +26,7 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_CUSTOMER")
@Api("客户产线代码")
@Api("客户信息")
public class MesCustomer extends BaseBean {
@Column(name="CUSTOMER_CODE")
@ApiParam("客户代码")

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java
Unescape Escape View File

@ -78,4 +78,8 @@ public class MesPlc extends BaseBean {
@Column(name = "ENABLED")
@ApiParam("是否启用 0 false 1 true")
private Integer enabled;
@Column(name = "PLC_CFG")
@ApiParam("PLC的值的设定")
private String plcCfg;
}

2
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java
Unescape Escape View File

@ -38,4 +38,6 @@ public class MesProdRouteCfg extends BaseBean {
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
}

6
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java
Unescape Escape View File

@ -35,7 +35,13 @@ public class MesRoute extends BaseBean {
@ApiParam("流程名称")
private String routeName;
@Column(name = "ROUTE_TYPE")
@ApiParam("流程类型 10-扫描类型 20-监控类型")
private Integer routeType;
@Column(name = "POSITION")
@ApiParam("GOJS位置")
private String position;
}

5
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java
Unescape Escape View File

@ -21,14 +21,13 @@ public class PlcCacheKeyModel {
private String tag;
public PlcCacheKeyModel(String channel, String device, String tag) {
this.channel = channel;
public PlcCacheKeyModel( String device, String tag) {
this.device = device;
this.tag = tag;
}
public String getPlcCacheKey() {
return channel + ":" + device + ":" + tag;
return device + ":" + tag;
}

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -57,4 +58,7 @@ public class StationRequestBean implements Serializable {
*/
@ApiParam("业务类型")
private String busiType;
@ApiParam("工单号")
private String workOrderNo;
}

13
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java
Unescape Escape View File

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcEquipment;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/9/28 12:04 PM
* @Description:
**/
public interface MesWcEquipmentRepository extends BaseRepository<MesWcEquipment,Long> {
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java
Unescape Escape View File

@ -55,6 +55,10 @@ public class MesEquipment extends BaseBean {
@ApiParam("区域代码")
private String areaCode;
@Column(name="CONNECT_TYPE")
@ApiParam("连接类型")
private Integer connectType;
@Transient
@ApiParam(value ="名称")
private String name;

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java
Unescape Escape View File

@ -38,4 +38,8 @@ public class MesProdRouteCfg extends BaseBean {
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "ROUTE_TYPE")
@ApiParam("流程类型 10-扫描类型 20-监控类型")
private Integer routeType;
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java
Unescape Escape View File

@ -38,4 +38,8 @@ public class MesRoute extends BaseBean {
@Column(name = "POSITION")
@ApiParam("GOJS位置")
private String position;
@Column(name = "ROUTE_TYPE")
@ApiParam("流程类型 10-扫描类型 20-监控类型")
private Integer routeType;
}

3
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
Unescape Escape View File

@ -39,6 +39,9 @@ public class BsSuitCaseModel implements Serializable {
@ApiParam(value = "REST 适配套件")
private BsSuitCaseREST bsSuitCaseREST;
@ApiParam(value = "FTP 适配器")
private BsSuitCaseFTP bsSuitCaseFTP;
@ApiParam(value = "分页数据")
private Pager pager;

37
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java
Unescape Escape View File

@ -0,0 +1,37 @@
package cn.estsh.i3plus.pojo.model.softswitch;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 2019/10/8 下午1:18
* @Modify:
**/
@Data
public class SuitParamModel {
/* 标签名称 */
private String tagName;
/* 标签 id 属性值 */
private String id;
/* 标签 name 属性值 */
private String name;
/* 标签唯一标识 */
private String pathKey;
/* 标签内容 */
private String value;
/* 标签类型 Default:PARAM_VALUE_TYPE.STRING */
private Integer type; // BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE
/* 标签属性 */
private Map<String,String> attr;
/* 父节点 */
private SuitParamModel parent;
/* 标签子集 */
private List<SuitParamModel> childList;
}

9
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java
Unescape Escape View File

@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -74,6 +73,14 @@ public class BsSslKey extends BaseBean {
@ApiParam(value = "证书描述")
private String keyDescription;
@Column(name = "KEY_USER_NAME")
@ApiParam(value = "证书账号")
private String keyUserName;
@Column(name = "KEY_PASSWORD")
@ApiParam(value = "证书密码")
private String keyPassword;
@Transient
@ApiParam(value = "证书参数集合")
private List<BsSslKeyParam> bsSslKeyParamList;

4
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
Unescape Escape View File

@ -215,6 +215,10 @@ public class BsSuitCase extends BaseBean {
private BsSslKey bsSslKey;
@Transient
@ApiParam(value = "适配器套件明细")
private String paramXml;
@Transient
@ApiParam(value = "适配器参数")
private List<BsSuitCaseParam> bsSuitCaseParamList;

88
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java
Unescape Escape View File

@ -0,0 +1,88 @@
package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-09-25 17:43
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BS_SUIT_CASE_FTP")
@Api(value = "FTP适配器", description = "FTP适配器")
public class BsSuitCaseFTP extends BaseBean {
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "套件id")
@JsonSerialize(using = ToStringSerializer.class)
private Long suitCaseId;
@Column(name = "file_Name")
@ApiParam(value = "文件名")
private String fileName;
@Column(name = "ENCODE")
@ApiParam(value = "编码")
private Integer encode;
@Column(name = "IS_READ_AND_EMPTY")
@ApiParam(value = "读取并清空")
private Integer isReadAndEmpty;
public boolean isReadAndEmpty(){
return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndEmpty);
}
@Column(name = "IS_READ_AND_DELETE")
@ApiParam(value = "读取并删除")
private Integer isReadAndDelete;
public boolean isReadAndDelete(){
return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndDelete);
}
@Column(name = "IS_NEED_TRAVERSAL")
@ApiParam(value = "是否需要遍历")
private Integer isNeedTraversal;
public boolean isNeedTraversal(){
return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isNeedTraversal);
}
@Column(name = "IS_INCREMENTAL_READ")
@ApiParam(value = "是否增量读取")
private Integer isIncrementalRead;
public boolean isIncrementalRead(){
return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isIncrementalRead);
}
@Transient
@ApiParam(value = "是否增量读取")
private String tempSuitFilePath;
@Transient
@ApiParam(value = "适配文件列表")
public List<BsSuitFile> bsSuitFileList;
}

78
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java
Unescape Escape View File

@ -0,0 +1,78 @@
package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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 :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-09-25 17:42
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BS_SUIT_FILE")
@Api(value = "适配文件信息", description = "适配文件信息")
public class BsSuitFile extends BaseBean {
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "套件id")
@JsonSerialize(using = ToStringSerializer.class)
private Long suitCaseId;
@Column(name = "SUIT_CASE_NAME_RDD")
@ApiParam(value = "适配套件名称")
private String suitCaseName;
@Column(name = "SUIT_CASE_CODE")
@ApiParam(value = "适配套件代码")
private String suitCaseCode;
@Column(name = "FOLDER_PATH")
@ApiParam(value = "文件夹路径")
private String folderPath;
@Column(name = "FILE_ID")
@ApiParam(value = "文件id")
@JsonSerialize(using = ToStringSerializer.class)
private Long fileId;
@Column(name = "FILE_NAME")
@ApiParam(value = "文件名称")
private String fileName;
@Column(name = "FILE_URL")
@ApiParam(value = "文件URL")
private String fileURL;
@Column(name = "FILE_SIZE")
@ApiParam(value = "文件大小")
private int fileSize;
@Column(name = "SUIT_DATE_TIME")
@ApiParam(value = "适配时间")
private String suitDateTime;
@Column(name = "PROCESS_STATE")
@ApiParam(value = "处理状态")
private Integer processState;
@Column(name = "PROCESS_TIME")
@ApiParam(value = "处理时间")
private String processTime;
}

4
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java
Unescape Escape View File

@ -39,6 +39,10 @@ public class BsSuitSchedule extends BaseBean {
@ApiParam(value = "适配套件名称")
private String suitCaseNameRdd;
@Column(name = "SUIT_CASE_CODE")
@ApiParam(value = "适配套件代码")
private String suitCaseCode;
@Column(name = "SCHEDULE_NAME")
@ApiParam(value = "任务名称")
private String scheduleName;

14
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseFTPRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseFTP;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-09-27 10:16
* @Modify:
**/
public interface BsSuitCaseFTPRepository extends BaseRepository<BsSuitCaseFTP,Long> {
}

16
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRESTRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseREST;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-09-23 15:39
* @Modify:
**/
@Repository
public interface BsSuitCaseRESTRepository extends BaseRepository<BsSuitCaseREST,Long> {
}

14
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitFileRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-09-27 10:17
* @Modify:
**/
public interface BsSuitFileRepository extends BaseRepository<BsSuitFile,Long> {
}

37
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
Unescape Escape View File

@ -4,8 +4,19 @@ 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.*;
import org.apache.commons.lang3.StringUtils;
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;
/**
* @Description :
@ -168,7 +179,7 @@ public class SoftSwitchHqlPack {
public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean);
DdlPreparedPack.getNumNOEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean);
@ -350,4 +361,24 @@ public class SoftSwitchHqlPack {
return ddlPackBean;
}
/**
* 适配文件条件封装
* @param bsSuitFile 查询条件
* @return
*/
public static DdlPackBean packHqlBsSuitCaseFile(BsSuitFile bsSuitFile){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseName(),"suitCaseName",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitFile.getFileName(), "fileName", ddlPackBean);
DdlPreparedPack.timeBuilder(bsSuitFile.getSuitDateTime(), "suitDateTime", ddlPackBean, false, true);
ddlPackBean.setOrderByStr(bsSuitFile.orderBy());
return ddlPackBean;
}
}

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java
Unescape Escape View File

@ -42,7 +42,7 @@ public class AmpJisRec extends BaseBean{
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java
Unescape Escape View File

@ -42,7 +42,7 @@ public class AmpStockCurrent extends BaseBean {
@ApiParam(value = "单位")
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
private Double qty;

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java
Unescape Escape View File

@ -46,7 +46,7 @@ public class SapDocFgSum extends BaseBean {
@ApiParam("单位")
public String partNameRdd;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@ -75,7 +75,7 @@ public class SapDocFgSum extends BaseBean {
@ApiParam("子计量单位")
public String itemUnit;
@Column(name="ITEM_QTY")
@Column(name="ITEM_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "子用量", example = "0")
public Double itemQty;

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
Unescape Escape View File

@ -45,7 +45,7 @@ public class WmsASNMasterDetails extends BaseBean {
@ApiParam("行号")
public String item;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@ -112,7 +112,7 @@ public class WmsASNMasterDetails extends BaseBean {
@ApiParam("供应商批次")
public String vendorLotNo;
@Column(name = "REC_QTY")
@Column(name = "REC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已收数量", example = "0")
public Double recQty;

11
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
Unescape Escape View File

@ -43,7 +43,7 @@ public class WmsBom extends BaseBean {
@ApiParam(value = "计量单位")
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "数量")
private Double qty;
@ -59,7 +59,7 @@ public class WmsBom extends BaseBean {
@ApiParam(value = "子计量单位")
private String itemUnit;
@Column(name = "ITEM_QTY")
@Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "子用量")
private Double itemQty;
@ -92,11 +92,14 @@ public class WmsBom extends BaseBean {
return this.itemQty == null ? 0 : this.itemQty.doubleValue();
}
public WmsBom(){}
public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum) {
public WmsBom() {
}
public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty) {
this.itemPartNo = itemPartNo;
this.itemPartNam = itemPartNam;
this.itemUnit = itemUnit;
this.bomNum = bomNum;
this.itemQty = itemQty;
}
}

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java
Unescape Escape View File

@ -40,7 +40,7 @@ public class WmsBomTotal extends BaseBean {
@ApiParam("计量单位")
private String UNIT;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam("数量")
private Double qty;
@ -56,7 +56,7 @@ public class WmsBomTotal extends BaseBean {
@ApiParam(value = "子计量单位")
private String itemUnit;
@Column(name = "ITEM_QTY")
@Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "子用量")
private Double itemQty;

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
Unescape Escape View File

@ -61,7 +61,7 @@ public class WmsCSFactTrans extends BaseBean {
@ApiParam("条码")
public String sn;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "库存数量", example = "0")
public Double qty;
@ -70,7 +70,7 @@ public class WmsCSFactTrans extends BaseBean {
@ApiParam("单位")
public String unit;
@Column(name="FACT_QTY")
@Column(name="FACT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "实盘数量", example = "0")
public Double factQty;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
Unescape Escape View File

@ -44,7 +44,7 @@ public class WmsCSOrderDetails extends BaseBean {
@ApiParam("行号")
public String item;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java
Unescape Escape View File

@ -66,11 +66,11 @@ public class WmsCheckFactRecord extends BaseBean {
@ApiParam("备注")
public String remark;
@Column(name="PLAN_QTY")
@Column(name="PLAN_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "应收数量", example = "0")
public Double planQty;
@Column(name="CHECK_QTY")
@Column(name="CHECK_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "抽点数量", example = "0")
public Double checkQty;

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
Unescape Escape View File

@ -66,7 +66,7 @@ public class WmsDocFgDetail extends BaseBean {
@ApiParam("BOM切换标识")
public String bomUpdate;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@ -91,7 +91,7 @@ public class WmsDocFgDetail extends BaseBean {
@ApiParam("子计量单位")
public String itemUnit;
@Column(name="ITEM_QTY")
@Column(name="ITEM_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "子用量", example = "0")
public Double itemQty;

12
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
Unescape Escape View File

@ -46,7 +46,7 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("行号")
public String item;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@ -83,7 +83,7 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("目标库位代码")
public String destLocateNo;
@Column(name = "PRINT_QTY")
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "条码打印数量", example = "1")
private Double printQty;
@ -119,22 +119,22 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam(value = "操作原因")
private String remark;
@Column(name = "PICK_QTY")
@Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已拣货数量", example = "1")
private Double pickQty;
@Column(name = "OUT_QTY")
@Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已出库数量", example = "1")
private Double outQty;
@Column(name = "REC_QTY")
@Column(name = "REC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已收货数量", example = "1")
private Double recQty;
@Column(name = "MOVE_QTY")
@Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已移库数量", example = "1")
private Double moveQty;

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
Unescape Escape View File

@ -162,6 +162,10 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam("类型名称")
public String busiTypeName;
@Transient
@ApiParam("物料编号")
public String partNo;
public int getOrderStatusVal() {
return this.orderStatus == null ? 0 : this.orderStatus;
}

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
Unescape Escape View File

@ -52,7 +52,7 @@ public class WmsDocMovementSn extends BaseBean {
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java
Unescape Escape View File

@ -46,7 +46,7 @@ public class WmsFGInStock extends BaseBean {
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;

6
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java
Unescape Escape View File

@ -59,15 +59,15 @@ public class WmsLineLocatePart extends BaseBean {
return isGeneratePicklist== null ? 0: this.isGeneratePicklist.intValue();
}
@Column(name = "PULL_QTY")
@Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "拉动数量")
private Double pullQty;
@Column(name = "Max")
@Column(name = "Max", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最大值")
private Double max;
@Column(name = "Min")
@Column(name = "Min", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最小值")
private Double min;

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
Unescape Escape View File

@ -77,7 +77,7 @@ public class WmsLocate extends BaseBean {
@ApiParam(value = "最大包装数量", example = "-1")
private Integer maxPackageQty;
@Column(name = "MAX_PART_QTY")
@Column(name = "MAX_PART_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最大零件数量", example = "-1")
private Double maxPartQty;
@ -93,7 +93,7 @@ public class WmsLocate extends BaseBean {
@ApiParam(value = "箱数", example = "-1")
private Integer boxQty;
@Column(name = "PART_QTY")
@Column(name = "PART_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "零件数", example = "-1")
private Double partQty;

6
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
Unescape Escape View File

@ -42,15 +42,15 @@ public class WmsLocatePart extends BaseBean {
@ApiParam(value = "物料名称")
private String partNameRdd;
@Column(name = "PULL_QTY")
@Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "拉动数量", example = "0")
private Double pullQty;
@Column(name = "MAX")
@Column(name = "MAX", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最大值", example = "0")
private Double max;
@Column(name = "MIN")
@Column(name = "MIN", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最小值", example = "0")
private Double min;

77
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
Unescape Escape View File

@ -24,7 +24,7 @@ import javax.persistence.*;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_MOVE_DETAILS", indexes = {
@Table(name = "WMS_MOVE_DETAILS", indexes = {
@Index(columnList = "PART_NO"),
@Index(columnList = "ORDER_NO"),
@Index(columnList = "ORGANIZE_CODE")
@ -33,94 +33,94 @@ import javax.persistence.*;
public class WmsMoveDetails extends BaseBean {
private static final long serialVersionUID = -5898637337319011710L;
@Column(name="ORDER_NO")
@Column(name = "ORDER_NO")
@ApiParam("单号")
public String orderNo;
@Column(name="ITEM")
@Column(name = "ITEM")
@ApiParam(value = "行号", example = "0")
public Integer item;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name="PART_NAME_RDD")
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="VENDOR_NO")
@Column(name = "VENDOR_NO")
@ApiParam("供应商编号")
public String vendorNo;
@Column(name="CUST_NO")
@Column(name = "CUST_NO")
@ApiParam("客户编号")
public String custNo;
@Column(name="TRANS_QTY")
@Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
public Double getTransQty(){
public Double getTransQty() {
return this.transQty == null ? 0 : this.transQty.doubleValue();
}
@Column(name="REJECT_QTY")
@Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "不合格处理数量", example = "0")
public Double rejectQty;
public Double getRejectQty(){
public Double getRejectQty() {
return this.rejectQty == null ? 0 : this.rejectQty.doubleValue();
}
@Column(name="UNIT")
@Column(name = "UNIT")
@ApiParam("单位")
public String unit;
@Column(name="SRC_WH_NO")
@Column(name = "SRC_WH_NO")
@ApiParam("源仓库代码")
public String srcWhNo;
@Column(name="SRC_ZONE_NO")
@Column(name = "SRC_ZONE_NO")
@ApiParam("源存储区代码")
public String srcZoneNo;
@Column(name="SRC_LOCATE_NO")
@Column(name = "SRC_LOCATE_NO")
@ApiParam("源库位代码")
public String srcLocateNo;
@Column(name="DEST_WH_NO")
@Column(name = "DEST_WH_NO")
@ApiParam("目标仓库代码")
public String destWhNo;
@Column(name="DEST_ZONE_NO")
@Column(name = "DEST_ZONE_NO")
@ApiParam("目标存储区代码")
public String destZoneNo;
@Column(name="DEST_LOCATE_NO")
@Column(name = "DEST_LOCATE_NO")
@ApiParam("目标库位代码")
public String destLocateNo;
/**
* 状态:1=创建,10=待处理,20=已处理
*/
@Column(name="ITEM_STATUS")
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
public Integer itemStatus;
@Column(name="REF_ITEM")
@Column(name = "REF_ITEM")
@ApiParam("关联单据行号")
public String refItem;
/**
* ASN,PO,SO
*/
@Column(name="REF_TYPE")
@Column(name = "REF_TYPE")
@ApiParam("关联单据类型")
public String refType;
@Column(name="REF_SRC")
@Column(name = "REF_SRC")
@ApiParam("关联单号")
public String refSrc;
@ -150,7 +150,7 @@ public class WmsMoveDetails extends BaseBean {
@Transient
@ApiParam("业务类型编码")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
private Integer busiTypeCode;
@Transient
@ -176,7 +176,7 @@ public class WmsMoveDetails extends BaseBean {
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public Integer lockVersion;
public Integer lockVersion;
@Transient
@ApiParam(value = "快照时间")
@ -200,20 +200,21 @@ public class WmsMoveDetails extends BaseBean {
return fPartName;
}*/
public WmsMoveDetails(){}
public WmsMoveDetails() {
}
public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
public WmsMoveDetails(String partNo, Long waitingCounts, Long finishedCounts) {
this.partNo = partNo;
this.waitingCounts = waitingCounts;
this.finishedCounts = finishedCounts;
}
public WmsMoveDetails(String partNo, double transQty){
public WmsMoveDetails(String partNo, double transQty) {
this.partNo = partNo;
this.transQty = transQty;
}
public WmsMoveDetails(String orderNo){
public WmsMoveDetails(String orderNo) {
this.orderNo = orderNo;
}
@ -225,8 +226,8 @@ public class WmsMoveDetails extends BaseBean {
return finishedCounts == null ? 0L : this.finishedCounts;
}
public WmsMoveDetails (String organizeCode,String partNo,String partNameRdd,String workCenterCode,String fPartNo,String fPartName,String unit,Double qty,
String createDateTime,String sn,String srcZoneNo){
public WmsMoveDetails(String organizeCode, String partNo, String partNameRdd, String workCenterCode, String fPartNo, String fPartName, String unit, Double qty,
String createDateTime, String sn, String srcZoneNo) {
this.organizeCode = organizeCode;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
@ -241,11 +242,11 @@ public class WmsMoveDetails extends BaseBean {
}
public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode
,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo,
String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo,
Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode,
String createUser,String createDatetime,String modifyUser,String modifyDatetime){
public WmsMoveDetails(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, String transTypeCode
, String transTypeName, Integer itemStatus, String unit, String srcWhNo, String destWhNo,
String srcZoneNo, String destZoneNo, String srcLocateNo, String destLocateNo,
Double transQty, Double rejectQty, String refSrc, String vendorNo, String custNo, Integer busiTypeCode,
String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
this.organizeCode = organizeCode;
this.partNo = partNo;
this.orderNo = orderNo;
@ -269,7 +270,7 @@ public class WmsMoveDetails extends BaseBean {
this.busiTypeCode = busiTypeCode;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyDatetime =modifyDatetime;
this.modifyUser =modifyUser;
this.modifyDatetime = modifyDatetime;
this.modifyUser = modifyUser;
}
}

6
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
Unescape Escape View File

@ -83,7 +83,7 @@ public class WmsMoveSn extends BaseBean {
@ApiParam("容器编号")
public String packAgeNo;
@Column(name = "SRC_QTY")
@Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "源数量", example = "0")
public Double srcQty;
@ -120,12 +120,12 @@ public class WmsMoveSn extends BaseBean {
@Transient
private Long finishedCounts;
@Column(name = "DEST_QTY")
@Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "目标数量", example = "0")
public Double destQty;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;

6
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
Unescape Escape View File

@ -84,11 +84,11 @@ public class WmsMoveToERP extends BaseBean {
@ApiParam("客户编号")
public String custNo;
@Column(name="TRANS_QTY")
@Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
@Column(name="REJECT_QTY")
@Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "不合格处理数量", example = "0")
public Double rejectQty;
@ -142,7 +142,7 @@ public class WmsMoveToERP extends BaseBean {
@ApiParam("关联单位")
public String refUnit;
@Column(name="REF_QTY")
@Column(name="REF_QTY", columnDefinition = "decimal(18,8)")
@ApiParam("关联数量")
public Double refQty;

12
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
Unescape Escape View File

@ -50,7 +50,7 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("行号")
private Integer item;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
private Double qty;
@ -67,28 +67,28 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("订单号")
private String orderNo;
@Column(name = "PRINT_QTY")
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "条码打印数量", example = "0")
private Double printQty;
//private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; }
@Column(name = "RC_QTY")
@Column(name = "RC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "收货数量", example = "0")
private Double rcQty;
//private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; }
@Column(name = "PASS_QTY")
@Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "质检合格数量", example = "0")
private Double passQty;
//private Double getPassQty(){ return this.passQty == null ? new Double(0) : this.passQty; }
@Column(name = "NG_QTY")
@Column(name = "NG_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "质检不合格数量", example = "0")
private Double ngQty;
@ -114,7 +114,7 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("状态")
private Integer itemStatus;
@Column(name = "SNP")
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
@ApiParam("标准包装")
private Double snp;

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java
Unescape Escape View File

@ -41,11 +41,11 @@ public class WmsPackSn extends BaseBean {
@ApiParam(value = "物料名称")
private String partNameAdd;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam("数量")
private Double qty;
@Column(name = "SID")
@Column(name = "SID", columnDefinition = "decimal(18,8)")
@ApiParam("SID")
private Double sId;

10
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
Unescape Escape View File

@ -74,7 +74,7 @@ public class WmsPart extends BaseBean {
@ApiParam(value = "采购单位")
private String buyUnit;
@Column(name = "BU2SU")
@Column(name = "BU2SU", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率1", example = "1")
private Double bu2su;
@ -82,11 +82,11 @@ public class WmsPart extends BaseBean {
@ApiParam(value = "计价单位")
private String priceUnit;
@Column(name = "PU2SU")
@Column(name = "PU2SU", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率2", example = "1")
private Double pu2su;
@Column(name = "SNP")
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
@ApiParam(value = "标准包装", example = "1")
private Double snp;
@ -95,11 +95,11 @@ public class WmsPart extends BaseBean {
@ApiParam(value = "是否免检", example = "1")
private Integer iqc;
@Column(name = "MIN")
@Column(name = "MIN", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最低库存", example = "1")
private Double min;
@Column(name = "MAX")
@Column(name = "MAX", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最高库存", example = "1")
private Double max;

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java
Unescape Escape View File

@ -51,7 +51,7 @@ public class WmsPoSn extends BaseBean {
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@ -84,7 +84,7 @@ public class WmsPoSn extends BaseBean {
@ApiParam("组条码")
public String groupNo;
@Column(name="REC_QTY")
@Column(name="REC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "收货数量", example = "0")
public Double recQty;

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java
Unescape Escape View File

@ -42,7 +42,7 @@ public class WmsQCDetails extends BaseBean {
@ApiParam("行号")
public String item;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@ -67,17 +67,17 @@ public class WmsQCDetails extends BaseBean {
public String remark;
@Column(name = "FACT_QTY")
@Column(name = "FACT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "实检数量", example = "0")
public Double factQty;
@Column(name = "PASS_QTY")
@Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "合格数量", example = "0")
public Double passQty;
@Column(name = "REJECT_QTY")
@Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
public Double rejectQty;

12
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java
Unescape Escape View File

@ -53,10 +53,18 @@ public class WmsRouting extends BaseBean {
@Column(name = "FOR_PRODUCT")
@ApiParam(value = "适用产品")
private Integer forProduct;
@Transient
@ApiParam(value = "补货规则列表")
List<WmsRoutingRule> replenishList;
@Transient
@ApiParam(value = "推动规则列表补")
List<WmsRoutingRule> promotionList;
public WmsRouting(){}
public WmsRouting() {
}
}

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java
Unescape Escape View File

@ -44,7 +44,7 @@ public class WmsShipping extends BaseBean {
@ApiParam("物料名称")
public String partNameRdd;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java
Unescape Escape View File

@ -44,7 +44,7 @@ public class WmsSnOperateRecord extends BaseBean {
@ApiParam(value = "库位代码")
private String locateNo;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "数量", example = "0")
private Double qty = 0d;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java
Unescape Escape View File

@ -61,7 +61,7 @@ public class WmsSnPrintRcd extends BaseBean {
@ApiParam(value = "单位")
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
private Double qty;

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java
Unescape Escape View File

@ -60,12 +60,12 @@ public class WmsStockInitialize extends BaseBean {
@AnnoOutputColumn
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "可用数量", example = "0")
@AnnoOutputColumn
private Double qty = 0d;
@Column(name = "SNP")
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
@ApiParam(value = "标准包装", example = "1")
@AnnoOutputColumn
private Double snp;

18
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
Unescape Escape View File

@ -79,47 +79,47 @@ public class WmsStockQuan extends BaseBean {
private WmsLocate wmsLocate;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "可用数量", example = "0")
public Double qty;
@Column(name = "FAIL_QTY")
@Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
private Double failQty;
@Column(name = "HOLD_QTY")
@Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "隔离数量", example = "0")
private Double holdQty;
@Column(name = "QC_QTY")
@Column(name = "QC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "质检中数量", example = "0")
private Double qcQty;
@Column(name = "RIN_QTY")
@Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "待入库数量", example = "0")
private Double rinQty;
@Column(name = "FREEZE_QTY")
@Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "冻结数量", example = "0")
private Double freezeQty;
@Column(name = "CONSIGN_QTY")
@Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "寄售数量", example = "0")
private Double consignQty;
@Column(name = "LOCK_QTY")
@Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "锁定数量", example = "0")
private Double lockQty;
@Column(name = "SCRAP_QTY")
@Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "报废数量", example = "0")
private Double scrapQty;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
Unescape Escape View File

@ -109,7 +109,7 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "单位")
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "数量", example = "0")
private Double qty = 0d;

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
Unescape Escape View File

@ -64,12 +64,12 @@ public class WmsTaskDetails extends BaseBean {
@ApiParam(value = "供应商编号")
private String vendorNo;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "1")
private Double qty;
@Column(name = "TRANS_QTY")
@Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "处理数量", example = "1")
private Double transQty;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java
Unescape Escape View File

@ -58,7 +58,7 @@ public class WmsTrans extends BaseBean{
@ApiParam(value ="交易状态",example = "1")
private Integer transStatus;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value ="需求数")
private Double qty;

18
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java
Unescape Escape View File

@ -98,47 +98,47 @@ public class WmsTransQuan extends BaseBean {
@ApiParam(value = "错误信息")
private String errorMessage;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "可用数量", example = "0")
public Double qty;
@Column(name = "FAIL_QTY")
@Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
private Double failQty;
@Column(name = "HOLD_QTY")
@Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "隔离数量", example = "0")
private Double holdQty;
@Column(name = "QC_QTY")
@Column(name = "QC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "质检中数量", example = "0")
private Double qcQty;
@Column(name = "RIN_QTY")
@Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "待入库数量", example = "0")
private Double rinQty;
@Column(name = "FREEZE_QTY")
@Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "冻结数量", example = "0")
private Double freezeQty;
@Column(name = "CONSIGN_QTY")
@Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "寄售数量", example = "0")
private Double consignQty;
@Column(name = "LOCK_QTY")
@Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "锁定数量", example = "0")
private Double lockQty;
@Column(name = "SCRAP_QTY")
@Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "报废数量", example = "0")
private Double scrapQty;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java
Unescape Escape View File

@ -58,7 +58,7 @@ public class WmsTransRcd extends BaseBean{
@ApiParam(value ="交易状态",example = "1")
private Integer transStatus;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value ="需求数")
private Double qty;

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java
Unescape Escape View File

@ -66,12 +66,12 @@ public class WmsTransSn extends BaseBean {
@ApiParam("事务代码")
public String transCode;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "交易数量", example = "0")
public Double qty;
@Column(name="REJECT_QTY")
@Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "不合格交易数量", example = "0")
public Double rejectQty;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java
Unescape Escape View File

@ -37,7 +37,7 @@ public class WmsUnitConvert extends BaseBean {
@ApiParam(value = "目标单位")
private String destUnitCode;
@Column(name = "UNIT_COEFFICIENT")
@Column(name = "UNIT_COEFFICIENT", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率")
private Double unitCoefficient;

13
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java → modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java
Unescape Escape View File

@ -1,11 +1,18 @@
package cn.estsh.i3plus.pojo.model.wms;
package cn.estsh.i3plus.pojo.wms.bean.iotio;
import lombok.Data;
import java.io.Serializable;
@Data
public class wmsCSOrderDetailsModel implements Serializable {
public class WmsCSOrderDetailsModel implements Serializable {
/******
*
* 工厂代码
*/
public String organizeCode;
/******

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java
Unescape Escape View File

@ -63,7 +63,7 @@ public class WmsMoveDetailsSnapshot extends BaseBean {
@ApiParam("客户编号")
public String custNo;
@Column(name="TRANS_QTY")
@Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
@ -71,7 +71,7 @@ public class WmsMoveDetailsSnapshot extends BaseBean {
return this.transQty == null ? 0 : this.transQty.doubleValue();
}
@Column(name="REJECT_QTY")
@Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "不合格处理数量", example = "0")
public Double rejectQty;

6
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java
Unescape Escape View File

@ -89,7 +89,7 @@ public class WmsMoveSnSnapshot extends BaseBean {
@ApiParam("容器编号")
public String packAgeNo;
@Column(name = "SRC_QTY")
@Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "源数量", example = "0")
public Double srcQty;
@ -126,12 +126,12 @@ public class WmsMoveSnSnapshot extends BaseBean {
@Transient
private Long finishedCounts;
@Column(name = "DEST_QTY")
@Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "目标数量", example = "0")
public Double destQty;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save