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

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

Browse Source
yun-zuoyi
andly.pan 3 years ago
parent a212e8591a 145f94c7a3
commit 91b45665a2
5 changed files with 126 additions and 80 deletions
Show Stats Download Patch File Download Diff File

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

@ -6,9 +6,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import cn.estsh.i3plus.pojo.aps.holders.EMaterial;
import cn.estsh.i3plus.pojo.aps.holders.EResource;
import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;

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

@ -82,4 +82,8 @@ public class SysParam extends BaseAPS {
@Column(name="SAME_MATERIAL_INTERVAL")
@ApiParam(value ="相同物料选择间隔")
private String sameMaterialInterval;
@Column(name="MERGE_RATIO")
@ApiParam(value ="合并余数需求比列")
private Integer mergeRatio;
}

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

@ -12,7 +12,6 @@ import java.util.function.Predicate;
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public class BeanRelation {
Map<Class<? extends BaseBean>, Map<Long, Map<Enum<?>, List<BaseBean>>>> caches = new HashMap<>();
@ -56,7 +55,8 @@ public class BeanRelation {
public static Map<Enum<?>, List<BaseBean>> get(BaseBean bean) {
Map<Enum<?>, List<BaseBean>> temp = get().caches.get(bean.getClass()).get(bean.getId());
if (temp == null) {
synchronized (bean.getClass()) {
synchronized (BaseBean.class) {
temp = get().caches.get(bean.getClass()).get(bean.getId());
if (temp == null) {
temp = createRelation(bean.getClass());
get().caches.get(bean.getClass()).put(bean.getId(), temp);

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

@ -9,6 +9,11 @@ import com.fasterxml.jackson.annotation.JsonFormat;
**/
public class ApsEnumUtil {
public interface Enumerator {
String getValue();
String getDescription();
}
/**
* 日历中选择星期的多选枚举
*/
@ -52,8 +57,7 @@ public class ApsEnumUtil {
/**
* 物料类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MATERIAL_TYPE {
public enum MATERIAL_TYPE implements Enumerator {
PRODUCT("PRODUCT", "成品"),
HALF_PRODUCT("HALF_PRODUCT", "半成品"),
RAW_MATERIAL("RAW_MATERIAL", "原材料"),
@ -68,10 +72,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -80,8 +86,7 @@ public class ApsEnumUtil {
/**
* 物料报表统计类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MATERIAL_REPORT_TYPE {
public enum MATERIAL_REPORT_TYPE implements Enumerator {
PURCHASE("PURCHASE", "采购"),
PRODUCE("PRODUCE", "生产"),
INVENTORY("INVENTORY", "库存");
@ -94,10 +99,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -106,8 +113,7 @@ public class ApsEnumUtil {
/**
* 报表时间间隔
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum REPORT_TIME_SPAN {
public enum REPORT_TIME_SPAN implements Enumerator {
ONE_HOUR("ONE_HOUR", "1小时"),
EIGHT_HOUR("EIGHT_HOUR", "8小时"),
TWELVE_HOUR("TWELVE_HOUR", "12小时"),
@ -123,10 +129,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -135,8 +143,7 @@ public class ApsEnumUtil {
/**
* 备料类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PREPARE_TYPE {
public enum PREPARE_TYPE implements Enumerator {
NO("NO", "不备料"),
SELF_MAKE("SELF_MAKE", "自制"), // 自制
PURCHASE("PURCHASE", "采购"); // 采购
@ -149,10 +156,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -161,8 +170,7 @@ public class ApsEnumUtil {
/**
* 补充类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum REPLENISHMENT_TYPE {
public enum REPLENISHMENT_TYPE implements Enumerator {
NO("NO", "不补充"),
BATCH("BATCH", "批量补充"),
ONEBYONE("ONEBYONE", "一对一补充");
@ -175,10 +183,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -224,8 +234,7 @@ public class ApsEnumUtil {
/**
* 排程方向
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DIRECTION {
public enum DIRECTION implements Enumerator {
POSITIVE("POSITIVE", "正向"),
REVERSE("REVERSE", "逆向");
@ -237,10 +246,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -249,8 +260,7 @@ public class ApsEnumUtil {
/**
* 则管理中规则的类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RULE_TYPE {
public enum RULE_TYPE implements Enumerator {
CANCEL_PLAN("CANCEL_PLAN", "取消计划"),
MAT_CALC("MAT_CALC", "物料运算"),
HEURISTIC("HEURISTIC", "排程运算"),
@ -265,10 +275,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -277,8 +289,7 @@ public class ApsEnumUtil {
/**
* 资源区分
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RESOURCE_CLASS {
public enum RESOURCE_CLASS implements Enumerator {
LIMITLESS("LIMITLESS", "无限能力"),
SINGLE("SINGLE", "单资源"),
BATCH("BATCH", "炉资源");
@ -291,10 +302,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -303,8 +316,7 @@ public class ApsEnumUtil {
/**
* 资源类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RESOURCE_TYPE {
public enum RESOURCE_TYPE implements Enumerator {
MAIN("MAIN", "主资源"),
ASS("ASS", "副资源");
@ -316,10 +328,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -398,8 +412,7 @@ public class ApsEnumUtil {
/**
* 订单删除限制
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_DEL_LIMIT {
public enum ORDER_DEL_LIMIT implements Enumerator {
NONE("NONE", "不限制"),
NO_PO("NO_PO", "未计划"),
NO_PLAN("NO_PLAN", "计划完毕"),
@ -414,10 +427,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -426,8 +441,7 @@ public class ApsEnumUtil {
/**
* 生产时间计算方法
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RES_COMB_TIME_TYPE {
public enum RES_COMB_TIME_TYPE implements Enumerator {
MAIN_RESOURCE("MAIN_RESOURCE", "主资源"),
MAX_ASS_RESOURCE("MAX_ASS_RESOURCE", "副资源最大值"),
MIN_ASS_RESOURCE("MIN_ASS_RESOURCE", "副资源最小值"),
@ -444,10 +458,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -456,8 +472,7 @@ public class ApsEnumUtil {
/**
* 工艺路径有效性判断类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTING_VALID_TYPE {
public enum ROUTING_VALID_TYPE implements Enumerator {
ORDER_CALC_LET("ORDER_CALC_LET", "与订单的最晚结束时刻计算值做比较"),
CALC_LET_LT("CALC_LET_LT", "与最晚结束时刻计算值-提前期做比较"),
BASE_TIME("BASE_TIME", "与基准时刻做比较");
@ -470,10 +485,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -482,8 +499,7 @@ public class ApsEnumUtil {
/**
* 使用类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum USE_TYPE {
public enum USE_TYPE implements Enumerator {
MAIN("MAIN", "主资源"),
FIRST_ASS("FIRST_ASS", "第一套副资源"),
SECOND_ASS("SECOND_ASS", "第二套副资源"),
@ -500,10 +516,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -512,8 +530,7 @@ public class ApsEnumUtil {
/**
* 工作计划类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_PLAN_TYPE {
public enum WORK_PLAN_TYPE implements Enumerator {
MAIN_PLAN("MAIN_PLAN", "主资源计划"),
ASS_PLAN("ASS_PLAN", "副资源计划"),
BATCH_PLAN("BATCH_PLAN", "炉资源计划");
@ -526,10 +543,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -538,8 +557,7 @@ public class ApsEnumUtil {
/**
* 工作关联类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_RELATION_TYPE {
public enum WORK_RELATION_TYPE implements Enumerator {
INNER("INNER", "订单内关联"),
OUTER("OUTER", "订单间关联");
@ -551,10 +569,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -563,8 +583,7 @@ public class ApsEnumUtil {
/**
* 工作排序规则
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_SORT_RULE {
public enum WORK_SORT_RULE implements Enumerator {
ORDER_LET("ORDER_LET", "订单最晚结束时刻计算值"),
ORDER_PRIORITY("ORDER_PRIORITY", "订单优先级"),
ORDER_EST("ORDER_EST", "订单最早开始时刻"),
@ -594,10 +613,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -606,8 +627,7 @@ public class ApsEnumUtil {
/**
* 工作状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_STATUS {
public enum WORK_STATUS implements Enumerator {
NOPLAN("NOPLAN", "未计划"),
PLANDONE("PLANDONE", "计划完毕"),
INDICATIONDONE("INDICATIONDONE", "锁定"),
@ -623,10 +643,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -635,8 +657,7 @@ public class ApsEnumUtil {
/**
* 工作种类
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_TYPE {
public enum WORK_TYPE implements Enumerator {
// 工作不参与排程，比如销售订单的工作
FICTITIOUS("FICTITIOUS", "虚拟工作"),
// 动态虚拟工作为不计算生产时间。
@ -652,10 +673,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -664,8 +687,7 @@ public class ApsEnumUtil {
/**
* 动态设置时间影响类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DYNAMIC_SET_TYPE {
public enum DYNAMIC_SET_TYPE implements Enumerator {
PREV_SET("PREV_SET", "只对前设置影响"),
POST_SET("POST_SET", "只对后设置影响"),
ALL("ALL", "对前后设置都产生影响");
@ -678,10 +700,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -690,8 +714,7 @@ public class ApsEnumUtil {
/**
* 动态设置事件取值方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DYNAMIC_SET_CALC {
public enum DYNAMIC_SET_CALC implements Enumerator {
MIN("MIN", "取最小值"),
MAX("MAX", "取最大值"),
SUM("SUM", "求和");
@ -704,10 +727,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -716,8 +741,7 @@ public class ApsEnumUtil {
/**
* 接续方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CONSTRAINT_TYPE {
public enum CONSTRAINT_TYPE implements Enumerator {
ES("ES", "前工序结束，后工序开始"),
SS("SS", "前工序开始，后工序开始"),
EE("EE", "前工序结束，后工序结束"),
@ -731,10 +755,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -743,8 +769,7 @@ public class ApsEnumUtil {
/**
* 加班日历类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CALENDAR_TYPE {
public enum CALENDAR_TYPE implements Enumerator {
ENABLE("ENABLE", "加班"),
DISABLE("DISABLE", "下班");
@ -756,10 +781,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -768,8 +795,7 @@ public class ApsEnumUtil {
/**
* 导入类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IMPORT_DETAIL_TYPE {
public enum IMPORT_DETAIL_TYPE implements Enumerator {
REPLACE("REPLACE", "替代导入"),
DIFF("DIFF", "差分导入");
@ -781,10 +807,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -793,11 +821,10 @@ public class ApsEnumUtil {
/**
* 计划类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PLAN_TYPE {
PREV_SET("", "前设置"),
PRODUCE("", "生产"),
POST_SET("", "后设置");
public enum PLAN_TYPE implements Enumerator {
PREV_SET("PREV_SET", "前设置"),
PRODUCE("PRODUCE", "生产"),
POST_SET("POST_SET", "后设置");
private final String value;
private final String description;
@ -807,10 +834,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -819,8 +848,7 @@ public class ApsEnumUtil {
/**
* 数据连接类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_LINK_TYPE {
public enum DATA_LINK_TYPE implements Enumerator {
EXCEL("EXCEL", "EXCEL"),
MYSQL("MYSQL", "MySql"),
ORACLE("ORACLE", "Oracle"),
@ -834,10 +862,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -846,8 +876,7 @@ public class ApsEnumUtil {
/**
* 字段的编辑类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum EDIT_TYPE {
public enum EDIT_TYPE implements Enumerator {
NONE("NONE", "未知"),
BOOLEAN("BOOLEAN", "布尔, 开关编辑"),
CHAR("CHAR", "字符, 文本框编辑"),
@ -876,10 +905,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -888,8 +919,7 @@ public class ApsEnumUtil {
/**
* 字段类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FIELD_TYPE {
public enum FIELD_TYPE implements Enumerator {
NONE("NONE", "未知"),
BOOLEAN("BOOLEAN", "布尔"),
CHAR("CHAR", "字符"),
@ -915,10 +945,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -927,8 +959,7 @@ public class ApsEnumUtil {
/**
* 资源符合时间间隔类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RESOURCE_LOAD_SPAN {
public enum RESOURCE_LOAD_SPAN implements Enumerator {
ONE_HOUR("ONE_HOUR", "1小时"),
TWO_HOUR("TWO_HOUR", "2小时"),
SIX_HOUR("SIX_HOUR", "6小时"),
@ -946,10 +977,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -958,8 +991,7 @@ public class ApsEnumUtil {
/**
* 订单状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_STATUS {
public enum ORDER_STATUS implements Enumerator {
NOPLAN("NOPLAN", "未计划"),
PLANDONE("PLANDONE", "计划完毕"),
INDICATIONDONE("INDICATIONDONE", "指示完毕"),
@ -975,10 +1007,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -987,8 +1021,7 @@ public class ApsEnumUtil {
/**
* 销售订单状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SALES_ORDER_STATUS {
public enum SALES_ORDER_STATUS implements Enumerator {
WAITING("WAITING", "待处理"),
CHANGE("CHANGE", "改带"),
COMMIT("COMMIT", "确认");
@ -1001,10 +1034,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -1013,8 +1048,7 @@ public class ApsEnumUtil {
/**
* 销售订单拆分下发
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SALES_ORDER_SPLIT_STATUS {
public enum SALES_ORDER_SPLIT_STATUS implements Enumerator {
NONE("NONE", "不拆分下发"),
SPLIT_MAIN("SPLIT_MAIN", "拆分下发（主）"),
SPLIT_CHILD("SPLIT_CHILD", "拆分下发（子）");
@ -1027,10 +1061,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -1039,8 +1075,7 @@ public class ApsEnumUtil {
/**
* 库存订单状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SAFE_STOCK_ORDER_STATUS {
public enum SAFE_STOCK_ORDER_STATUS implements Enumerator {
UNCOMMIT("UNCOMMIT", "待处理"),
COMMIT("COMMIT", "确认");
@ -1052,10 +1087,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -1064,8 +1101,7 @@ public class ApsEnumUtil {
/**
* 插单状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum INSERTED_ORDER_STATUS {
public enum INSERTED_ORDER_STATUS implements Enumerator {
UNCOMMIT("UNCOMMIT", "待处理"),
COMMIT("COMMIT", "确认");
@ -1077,10 +1113,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -1089,8 +1127,7 @@ public class ApsEnumUtil {
/**
* 插单状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FEED_BACK_STATUS {
public enum FEED_BACK_STATUS implements Enumerator {
UNCOMMIT("UNCOMMIT", "未提交"),
COMMIT("COMMIT", "提交");
@ -1102,10 +1139,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}
@ -1114,8 +1153,7 @@ public class ApsEnumUtil {
/**
* 订单类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum APS_ORDER_TYPE {
public enum APS_ORDER_TYPE implements Enumerator {
SALES_ORDER("SALES_ORDER", "S", "销售订单"),
PRODUCT_ORDER("PRODUCT_ORDER", "M", "生产订单"),
PURCHASE_ORDER("PURCHASE_ORDER", "P", "采购订单"),
@ -1134,12 +1172,14 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
public String getPrefix() { return prefix; }
@Override
public String getDescription() {
return description;
}
@ -1148,8 +1188,7 @@ public class ApsEnumUtil {
/**
* 工序类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SANLUX_OPERATION_TYPE {
public enum SANLUX_OPERATION_TYPE implements Enumerator {
NORMAL("NORMAL", "正常工序"),
FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"),
FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间自动牵纱"),
@ -1170,10 +1209,12 @@ public class ApsEnumUtil {
this.description = description;
}
@Override
public String getValue() {
return value;
}
@Override
public String getDescription() {
return description;
}

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

@ -239,7 +239,10 @@ public class WmsHqlPack {
DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCostCenter(), "costCenter", packBean);
DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getThirdRemake(), "thirdRemake", packBean);
DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean);
DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getFourthRemake(), "fourthRemake", packBean);
DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getAssignPlanDate(), "assignPlanDate", packBean);
DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getAssignDestZoneNo(),"assignDestZoneNo",packBean);
DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getAssignSrcZoneNo(),"assignSrcZoneNo",packBean);
getStringBuilderPack(wmsDocMovementMaster, packBean);
return packBean;

Write Preview
Loading…
Cancel
Save