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

Merge branch 'test'

Browse Source
yun-zuoyi
WYnneaoapc 6 years ago
parent 852083f667 5af777c4fd
commit ec49074a8b
58 changed files with 931 additions and 400 deletions
Show Stats Download Patch File Download Diff File

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

@ -35,8 +35,7 @@ public class ExportProject extends BaseAPS {
@Column(name="LINK_ID")
@ApiParam(value ="数据连接对象")
@FieldAnnotation(property = false)
@JsonIgnore
@FieldAnnotation(relation = "Link", notEmpty = true)
private Long linkId;
public DataLink getLink() {

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

@ -34,7 +34,7 @@ public class ImportProject extends BaseAPS {
@Column(name="LINK_ID")
@ApiParam(value ="数据连接对象")
@FieldAnnotation(property = false)
@FieldAnnotation(relation = "Link", notEmpty = true)
private Long linkId;
public DataLink getLink() {

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

@ -1,5 +1,6 @@
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.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
@ -27,17 +28,21 @@ import java.util.Date;
public class OvertimeCalendar extends BaseAPS {
@Column(name="RES_CODES")
@ApiParam(value ="资源代码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)
private String resCodes;
@Column(name="START")
@ApiParam(value ="开始时间")
@FieldAnnotation(notEmpty = true)
private Date start;
@Column(name="END")
@ApiParam(value ="结束时间")
@FieldAnnotation(notEmpty = true)
private Date end;
@Column(name="TYPE")
@ApiParam(value ="类型")
@FieldAnnotation(defaultValue = "ENABLE")
private ApsEnumUtil.CALENDAR_TYPE type;
}

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

@ -52,7 +52,7 @@ public class DateDuration {
* 是否为有效时间区间，若用户指定了时间区间，但解析错误，其时间区间为0
* @return
*/
public boolean Valid() {
public boolean valid() {
return this.bValid;
}
@ -124,7 +124,7 @@ public class DateDuration {
return strExtraString.toString();
}
public void Divide(double val) {
public void divide(double val) {
if (val < PRECISION) {
return;
}
@ -165,7 +165,7 @@ public class DateDuration {
return;
}
if (!ValueValid()) {
if (!valueValid()) {
this.time = 0;
this.rate = 0.0f;
this.bValid = false;
@ -173,42 +173,35 @@ public class DateDuration {
}
ArrayList<EV_STRING> lst = new ArrayList<EV_STRING>();
Decompound(lst);
decompound(lst);
boolean oFlg = lst.size() == 1;
for (EV_STRING evs : lst) {
if (evs.type == EV_STRING_TYPE.EVS_GOOD)
{
AbstractMap.SimpleEntry<Boolean, Integer> extraTime = TransTime_Each(evs.value);
if (extraTime.getKey() || !oFlg)
{
if (evs.type == EV_STRING_TYPE.EVS_GOOD) {
AbstractMap.SimpleEntry<Boolean, Integer> extraTime = transTimeEach(evs.value);
if (extraTime.getKey() || !oFlg) {
this.time += extraTime.getValue();
}
else
{
} else {
this.time += extraTime.getValue() * 1;
}
}
else
{
AbstractMap.SimpleEntry<Boolean, Double> extraPer = TransRate_Each(evs.value);
if (extraPer.getKey())
{
else {
AbstractMap.SimpleEntry<Boolean, Double> extraPer = transRateEach(evs.value);
if (extraPer.getKey()) {
this.rate = extraPer.getValue();
}
}
}
if (this.time < 0)
{
if (this.time < 0) {
this.time = 0;
this.rate = 0.0f;
this.bValid = false;
}
}
private boolean ValueValid() {
private boolean valueValid() {
for (char ch : this.value.toCharArray()) {
if (ch <= 'z' && ch >= 'a') {
ch -= 32;
@ -232,61 +225,46 @@ public class DateDuration {
|| ch == 'M' || ch == 'S' || ch == '+'||ch == '-'||ch == 'P');
}
private void Decompound(ArrayList<EV_STRING> lst) {
private void decompound(ArrayList<EV_STRING> lst) {
int len = this.value.length();
int iStr = 0;
EV_STRING evs = new EV_STRING();
evs.type = EV_STRING_TYPE.EVS_GOOD;
while(iStr < len)
{
while(iStr < len) {
char ch = this.value.charAt(iStr);
if (ch == '+')
{
if (ch == '+') {
lst.add(evs.clone());
evs.value = "";
evs.type = EV_STRING_TYPE.EVS_GOOD;
iStr++;
continue;
}
else if (ch == '-')
{
} else if (ch == '-') {
int iPre = iStr;
if (iPre != 0)
{
if (iPre != 0) {
iPre--;
char cp = this.value.charAt(iPre);
if (!(cp == 'D' || cp == 'H'
|| cp == 'M' || cp == 'S'))
{
|| cp == 'M' || cp == 'S')) {
evs.value = evs.value + 'S';
}
}
}
else if (ch == 'P')
{
} else if (ch == 'P') {
int iTempIndex = 0;
StringBuffer temp1 = new StringBuffer();
StringBuffer temp2 = new StringBuffer();
int iTemp = evs.value.length() - 1;
for (;iTemp >= 0;iTemp--)
{
for (;iTemp >= 0;iTemp--) {
char cTemp = evs.value.charAt(iTemp);
if (cTemp == 'D' || cTemp == 'H'
|| cTemp == 'M' || cTemp == 'S')
{
|| cTemp == 'M' || cTemp == 'S') {
iTempIndex++;
}
if (iTempIndex >= 2)
{
} if (iTempIndex >= 2) {
temp1.insert(0,cTemp);
}
else
{
} else {
temp2.insert(0,cTemp);
}
}
if (!temp1.toString().isEmpty())
{
if (!temp1.toString().isEmpty()) {
EV_STRING evs1 = new EV_STRING();
evs1.type = EV_STRING_TYPE.EVS_GOOD;
evs1.value = temp1.toString();
@ -296,12 +274,10 @@ public class DateDuration {
evs.type = EV_STRING_TYPE.EVS_HAVE_P;
evs.value = evs.value + ch;
iStr++;
if (iStr != len)
{
if (iStr != len) {
char cp = this.value.charAt(iStr);
if (cp == 'D' || cp == 'H'
|| cp == 'M' || cp == 'S')
{
|| cp == 'M' || cp == 'S') {
evs.value = evs.value + cp;
iStr++;
}
@ -315,13 +291,12 @@ public class DateDuration {
evs.value = evs.value + ch;
iStr++;
}
if (!evs.value.isEmpty())
{
if (!evs.value.isEmpty()) {
lst.add(evs);
}
}
private AbstractMap.SimpleEntry<Boolean, Integer> TransTime_Each(String extraValue) {
private AbstractMap.SimpleEntry<Boolean, Integer> transTimeEach(String extraValue) {
if (extraValue.isEmpty())
return new AbstractMap.SimpleEntry<Boolean, Integer>(false, 0);
@ -330,16 +305,13 @@ public class DateDuration {
boolean flg = false;
for (int i = 0; i < extraValue.length(); i++) {
char ch = extraValue.charAt(i);
int rate = TimeUnit(ch);
if (rate > 0)
{
int rate = timeUnit(ch);
if (rate > 0) {
double iC = Double.parseDouble(temp.toString());
extraTime += (int)(iC*rate);
temp.setLength(0);
flg = true;
}
else
{
} else {
temp.append(ch);
}
}
@ -347,7 +319,7 @@ public class DateDuration {
extraTime += Double.parseDouble(temp.toString());
return new AbstractMap.SimpleEntry<Boolean, Integer>(flg, extraTime);
}
private AbstractMap.SimpleEntry<Boolean, Double> TransRate_Each(String extraValue) {
private AbstractMap.SimpleEntry<Boolean, Double> transRateEach(String extraValue) {
if (extraValue.isEmpty())
return new AbstractMap.SimpleEntry<Boolean, Double>(false, 0.0);
@ -356,8 +328,7 @@ public class DateDuration {
boolean flg = false;
for (int i = 0; i < extraValue.length(); i++) {
char ch = extraValue.charAt(i);
switch(ch)
{
switch(ch) {
case 'D': extraPer = flg ? (1 / Double.parseDouble(temp.toString())) * 86400 : Double.parseDouble(temp.toString()) * 86400; return new AbstractMap.SimpleEntry<Boolean, Double>(true, extraPer);
case 'H': extraPer = flg ? (1 / Double.parseDouble(temp.toString())) * 3600: Double.parseDouble(temp.toString()) * 3600; return new AbstractMap.SimpleEntry<Boolean, Double>(true, extraPer);
case 'M': extraPer = flg ? (1 / Double.parseDouble(temp.toString())) * 60 : Double.parseDouble(temp.toString()) * 60; return new AbstractMap.SimpleEntry<Boolean, Double>(true, extraPer);
@ -366,12 +337,11 @@ public class DateDuration {
default : temp.append(ch);
}
}
return new AbstractMap.SimpleEntry<Boolean, Double>(true, extraPer);
return new AbstractMap.SimpleEntry<>(true, extraPer);
}
private int TimeUnit(char ch) {
switch(ch)
{
private int timeUnit(char ch) {
switch(ch) {
case 'D': return 86400;
case 'H': return 3600;
case 'M': return 60;

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

@ -1,11 +1,20 @@
package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.base.common.Pager;
import io.swagger.annotations.Api;
import lombok.Data;
import java.util.List;
/**
* @Description : 表格分页查询参数
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-11-22
* @Modify:
**/
@Data
@Api("表格分页查询参数")
public class APSPager extends Pager {
public static class SortData {
// 排序对象

25
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java
Unescape Escape View File

@ -0,0 +1,25 @@
package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import lombok.Data;
import java.util.Date;
/**
* @Description : 报表分页查询参数
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-11-22
* @Modify:
**/
@Data
@Api("报表分页查询参数")
public class ReportPager extends Pager {
private String filter; // 物料筛选条件
private Date begin; // 统计开始时间
private Date end; // 统计结束时间
private ApsEnumUtil.MATERIAL_REPORT_TYPE type;
private ApsEnumUtil.REPORT_TIME_SPAN span; // 统计时间间隔
}

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="ExportProject">
<Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
<Relation field="Link" name="DataLink" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="Details" name="ExportDetail" reverse="Project" type="ONE_TO_MULTI" owner="true">
</Relation>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="ImportProject">
<Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
<Relation field="Link" name="DataLink" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="Details" name="ImportDetail" reverse="Project" type="ONE_TO_MULTI" owner="true">
</Relation>

47
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.base.codemaker;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sun.management.VMManagement;
@ -10,6 +11,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.concurrent.ConcurrentHashMap;
/**
* @Description : 使用SnowFlake，生成分布式ID
@ -24,17 +26,28 @@ public class SnowflakeIdMaker {
public static final Logger LOGGER = LoggerFactory.getLogger(SnowflakeIdMaker.class);
private static final ConcurrentHashMap<String,SnowflakeIdMaker> RAM_CACHE_MAP = new ConcurrentHashMap();
private long workerId;
private long datacenterId;
private long sequence = 0L;
public SnowflakeIdMaker(){
/**
* 禁止私自构建,防止ID重复
*/
@Deprecated
private SnowflakeIdMaker() {
this.workerId = getWorkerMacId();
this.datacenterId = getDatacenterPid();
this.sequence = 0L;
}
public SnowflakeIdMaker(long workerId, long datacenterId){
/**
* 禁止私自构建 防止 ID 生成重复
* @param workerId 工作区ID
* @param datacenterId 数据区ID
*/
private SnowflakeIdMaker(long workerId, long datacenterId) {
if (workerId > maxWorkerId || workerId < 0) {
throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
}
@ -46,6 +59,36 @@ public class SnowflakeIdMaker {
this.datacenterId = datacenterId;
}
/**
* 获取雪花生成器
* @param workerId 工作区ID
* @param softType 产品类型
* @return
*/
public static SnowflakeIdMaker getSnowflakeIdMaker(long workerId, CommonEnumUtil.SOFT_TYPE softType) {
if(softType == null){
throw new IllegalArgumentException(String.format("The data warehouse soft type in the data center cannot be empty"));
}
return getSnowflakeIdMaker(workerId, softType.getSnowflakeId());
}
/**
* 获取雪花生成器
* @param workerId 工作区ID
* @param datacenterId 数据仓ID
* @return
*/
public static SnowflakeIdMaker getSnowflakeIdMaker(long workerId, long datacenterId) {
String cacheKey = workerId + "_" + datacenterId;
SnowflakeIdMaker maker = RAM_CACHE_MAP.get(cacheKey);
if (maker == null) {
maker = new SnowflakeIdMaker(workerId, datacenterId);
RAM_CACHE_MAP.put(cacheKey, maker);
}
return maker;
}
private long twepoch = 1288834974657L;
private long workerIdBits = 5L;

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

@ -80,6 +80,61 @@ public class ApsEnumUtil {
}
/**
* 物料报表统计类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MATERIAL_REPORT_TYPE {
PRODUCE("PRODUCE", "生产"),
PURCHASE("PURCHASE", "采购"),
INVENTORY("INVENTORY", "库存");
private String value;
private String description;
MATERIAL_REPORT_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 报表时间间隔
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum REPORT_TIME_SPAN {
ONE_HOUR("ONE_HOUR", "1小时"),
EIGHT_HOUR("EIGHT_HOUR", "8小时"),
TWELVE_HOUR("TWELVE_HOUR", "12小时"),
ONE_DAY("ONE_DAY", "一天"),
ONE_WEEK("ONE_WEEK", "一周"),
ONE_MONTH("ONE_MONTH", "一月");
private String value;
private String description;
REPORT_TIME_SPAN(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 备料类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -618,7 +673,6 @@ public class ApsEnumUtil {
MIN_OPERATION_REMAIN_TIME("MIN_OPERATION_REMAIN_TIME", "最小工序宽裕时间"),
WORK_LET("WORK_LET", "工作最晚结束时刻"),
WORK_EST("WORK_EST", "工作最早开始时刻"),
INVENTORY_RELA("INVENTORY_RELA", "订单物品库存量相对值"),
FIRST_WORK_BEGIN("FIRST_WORK_BEGIN", "订单首工作上次开始时刻"),
HAVE_HIGH_WORK("HAVE_HIGH_WORK", "订单中含有高级别工作"),
WORK_RESOURCE_SIZE("WORK_RESOURCE_SIZE", "工作的可用资源数"),

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

@ -17,35 +17,54 @@ public class CommonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SOFT_TYPE {
IMPP(1, "impp-platform", "IMPP平台"),
CORE(2, "i3core", "i3业务平台"),
WMS(3, "i3wms", "仓库管理软件"),
MES(4, "i3mes", "生产管理软件"),
QMS(5, "i3qms", "质量管理软件"),
MES_PCN(6, "i3mes-pcn", "生产管理软件-节点中心"),
SWEB(7, "i3sweb", "供应商服务"),
FORM(20,"block-form","智能表单"),
REPORT(21,"block-report","智能报表"),
WORKFLOW(22,"block-workflow","智能工作流"),
JOBFLOW(23,"block-jobflow","智能作业流"),
SOFTSWITCH(24,"block-softswitch","软件适配器"),
HARDSWITCH(25,"block-hardswitch","硬件适配器"),
LAC(26,"lac","连接适配器"),
ANDON(27,"andon","安灯"),
APS(28,"APS","高级计划与排程"),
CENTER(99,"icloud-server","注册中心"),
SURFACE(98,"i3surface","对外服务"),
CLOUD(97,"i3cloud","微服务"),
GATEWAY(96,"impp-gateway","服务网关"),
CONSOLE(95,"impp-console","服务监控台");
IMPP(1, 0, 0, "impp-platform", "IMPP平台"),
CORE(2, 8100, 4, "i3core", "i3业务平台"),
WMS(3, 8200, 10, "i3wms", "仓库管理软件"),
MES(4, 8300, 11, "i3mes", "生产管理软件"),
QMS(5, 0, 0, "i3qms", "质量管理软件"),
MES_PCN(6, 8350, 12, "i3mes-pcn", "生产管理软件-节点中心"),
SWEB(7, 8800, 19, "i3sweb", "供应商服务"),
FORM(20, 8900, 16, "block-form", "智能表单"),
REPORT(21, 8910, 17, "block-report", "智能报表"),
WORKFLOW(22, 0, 0, "block-workflow", "智能工作流"),
JOBFLOW(23, 0, 0, "block-jobflow", "智能作业流"),
SOFTSWITCH(24, 8920, 18, "block-softswitch", "软件适配器"),
HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"),
LAC(26, 8600, 13, "lac", "连接适配器"),
ANDON(27, 8500, 14, "andon", "安灯"),
APS(28, 8410, 15, "APS", "高级计划与排程"),
CENTER(99, 8000, 1, "icloud-server", "注册中心"),
SURFACE(98, 0, 0, "i3surface", "对外服务"),
CLOUD(97, 0, 0, "i3cloud", "微服务"),
GATEWAY(96, 9000, 3, "impp-gateway", "服务网关"),
CONSOLE(95, 8010, 2, "impp-console", "服务监控台");
/**
* 产品ID
*/
private int value;
/**
* 应用默认端口
*/
private int prot;
/**
* 应用默认雪花DataBaseId(0-31)共32 个存储区
*/
private int snowflakeId;
/**
* 产品代码
*/
private String code;
/**
* 产品描述
*/
private String description;
private SOFT_TYPE(int value, String code, String description) {
SOFT_TYPE(int value, int prot, int snowflakeId, String code, String description) {
this.value = value;
this.prot = prot;
this.snowflakeId = snowflakeId;
this.code = code;
this.description = description;
}
@ -62,6 +81,14 @@ public class CommonEnumUtil {
return description;
}
public int getProt() {
return prot;
}
public int getSnowflakeId() {
return snowflakeId;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -82,6 +109,15 @@ public class CommonEnumUtil {
return tmp;
}
public static SOFT_TYPE codeOf(String code) {
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
return values()[i];
}
}
return null;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {

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

@ -252,10 +252,10 @@ public class LacEnumUtil {
}
/**
* 指令操作类型
* 指令操作对象类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum COMMAND_OPERATE_TYPE{
public enum OPERATE_OBJ_TYPE{
COMMAND_STACK(10,"指令集"),
COMMAND_STACK_STEP(20,"指令集步骤"),
COMMAND_STACK_STEP_TASK(30,"指令集步骤任务");
@ -263,7 +263,7 @@ public class LacEnumUtil {
private int value;
private String description;
COMMAND_OPERATE_TYPE(int value, String description) {
OPERATE_OBJ_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -288,24 +288,24 @@ public class LacEnumUtil {
}
/**
* 指令操作类型
* 操作指令
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum COMMAND_OPERATE{
RESUME(11,"恢复",COMMAND_OPERATE_TYPE.COMMAND_STACK),
PAUSE(12,"暂停",COMMAND_OPERATE_TYPE.COMMAND_STACK),
CLOSE(13,"关闭",COMMAND_OPERATE_TYPE.COMMAND_STACK),
NEXT_STEP(14,"下一步",COMMAND_OPERATE_TYPE.COMMAND_STACK),
INTERRUPT(21,"中断",COMMAND_OPERATE_TYPE.COMMAND_STACK_STEP_TASK);
public enum OPERATE_COMMAND{
STACK_RESUME(11,"恢复",OPERATE_OBJ_TYPE.COMMAND_STACK),
STACK_PAUSE(12,"暂停",OPERATE_OBJ_TYPE.COMMAND_STACK),
STACK_CLOSE(13,"关闭",OPERATE_OBJ_TYPE.COMMAND_STACK),
STACK_SKIP(14,"跳过",OPERATE_OBJ_TYPE.COMMAND_STACK),
TASK_INTERRUPT(21,"中断",OPERATE_OBJ_TYPE.COMMAND_STACK_STEP_TASK);
private int value;
private String description;
private COMMAND_OPERATE_TYPE commandOperateType;
private OPERATE_OBJ_TYPE operateObjType;
COMMAND_OPERATE(int value, String description,COMMAND_OPERATE_TYPE commandOperateType) {
OPERATE_COMMAND(int value, String description,OPERATE_OBJ_TYPE operateObjType) {
this.value = value;
this.description = description;
this.commandOperateType = commandOperateType;
this.operateObjType = operateObjType;
}
public int getValue() {
@ -325,6 +325,20 @@ public class LacEnumUtil {
}
return tmp;
}
public static OPERATE_COMMAND 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 OPERATE_OBJ_TYPE getOperateObjType() {
return operateObjType;
}
}
}

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

@ -12,6 +12,181 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* 包装规格-是否混包 MES_PACK_SPEC
* 10.
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PACK_SPEC_IS_MIXED {
TRUE(1, "是"),
FALSE(2, "否");
private int value;
private String description;
MES_PACK_SPEC_IS_MIXED(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 Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* PCN同步MES主数据同步类型枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SYNC_TYPE {
GET_MES_DATA(1, "pcn获取mes数据"),
DATA_TO_MES(2, "pcn推送数据至mes");
private int value;
private String description;
SYNC_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 Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* PCN同步MES主数据同步方式枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SYNC_PATTERN {
UPDATE(1, "修改或新增"),
INSERT(2, "新增");
private int value;
private String description;
SYNC_PATTERN(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 Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* MES_TYPE_CFG 类型信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_TYPE_CFG {
DEFECT("DEFECT", "缺陷"),
DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
REPAIR("REPAIR", "处理措施"),
SCRAP("SCRAP", "报废原因");
private String value;
private String description;
MES_TYPE_CFG(String value, String description) {
this.value = value;
this.description = description;
}
public String 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.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* RAW_PART_STATUS 原材料状态
@ -407,6 +582,16 @@ public class MesEnumUtil {
}
return tmp;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -1096,7 +1281,11 @@ public class MesEnumUtil {
MES_PLAN_ORDER(10, "生产计划"),
MES_EQUIPMENT(20, "设备台账"),
MES_EQU_TASK_STANDARD(30, "设备作业要求"),
MES_CUST_ORDER(40, "客户订单");
MES_CUST_ORDER(40, "客户订单"),
MES_PCN_SYNC_CFG(50, "PCN同步配置"),
MES_PART(60, "物料表"),
MES_PRODUCE_CATEGORY(70, "产品类型"),
MES_PACK_SPEC(80, "包装规格");
private int value;
private String description;
@ -2945,9 +3134,8 @@ public class MesEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CONFIG_TYPE {
FASTDFS_SAVE_PATH(10, "SAVE_PATH", ""),
NGINX_IP(20, "NGINX_HOST", ""),
NGINX_HOST(20, "NGINX_HOST", ""),
MES_STATION_SOCKET(30, "mes_station_socket", ""),
GATEWAY_IP(40, "GATEWAY_HOST", ""),
UPDATE_SYNC_TIME(50, "SYNC_DATA_URL", "UPDATE_SYNC_TIME"),

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

@ -643,8 +643,8 @@ public class WmsEnumUtil {
KT_DEFINITE(430,"KT_DEFINITE", "KT合格"),
VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"),
KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货");
KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"),
FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运");
private int value;
private String code;
@ -950,6 +950,7 @@ public class WmsEnumUtil {
INSTOCKED(40, "入库"),
PICKED(50, "配料"),
OUT_STOCK(60, "出库"),
SCRAP(70, "报废"),
COMMING(80, "在途");
private int value;

23
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java
Unescape Escape View File

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.lac.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -16,15 +18,22 @@ import lombok.Data;
public class LacCommandOperate {
@ApiParam(value ="指令集记录id" , example = "-1")
private Long commandStackRecordId;
private Long operateObjId;
@ApiParam(value ="步骤任务id" , example = "-1")
private Long commandStackStepTaskIdId;
@ApiParam(value ="操作类型" , example = "-1")
private Integer operateType;
@ApiParam(value ="操作对象类型" , example = "-1")
@AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_OBJ_TYPE.class)
private Integer operateObjType;
@ApiParam(value ="操作" , example = "-1")
private Integer operate;
@AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_COMMAND.class)
private Integer operateCommand;
public LacCommandOperate(){}
public LacCommandOperate(Long operateObjId,LacEnumUtil.OPERATE_COMMAND operateCommand){
this.operateObjId = operateObjId;
this.operateCommand = operateCommand.getValue();
this.operateObjType = operateCommand.getOperateObjType().getValue();
}
}

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

@ -116,7 +116,7 @@ public class LacCommandStackStepTask extends BaseBean {
private LacLogTask logTask;
public Long getTaskInstanceId(){
if(lacSuitTask == null){
if(logTask != null){
return logTask.getId();
}
return null;

28
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
Unescape Escape View File

@ -29,6 +29,34 @@ public class LacHqlPack {
private LacHqlPack() {
}
/**
* In 参数封装
* @param columnName
* @return
*/
public static DdlPackBean packHqlInArray(String columnName, Object[] params){
DdlPackBean ddlPackBean =DdlPackBean.getDdlPackBean();
// 参数数组 [1,2,3] -> "1,2,3"
DdlPreparedPack.getInPackArray(params,columnName,ddlPackBean);
return ddlPackBean;
}
/**
* In 参数封装
* @param columnName
* @return
*/
public static DdlPackBean packHqlInList(String columnName, List params){
DdlPackBean ddlPackBean =DdlPackBean.getDdlPackBean();
// 参数数组 [1,2,3] -> "1,2,3"
DdlPreparedPack.getInPackList(params,columnName,ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlLacTaskType(LacTaskType bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();

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

@ -55,7 +55,7 @@ public class IfDismantleRecord extends BaseBean {
@Column(name = "QTY")
@ApiParam("产品数量")
private Integer qty;
private Double qty;
@Column(name = "DISMANTLE_QTY")
@ApiParam("拆解数")

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

@ -50,7 +50,7 @@ public class IfPackageDetail extends BaseBean {
@Column(name = "QTY")
@ApiParam("数量")
private String qty;
private Double qty;
@Column(name = "PACKAGE_NO2")
@ApiParam("包装编号2")

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

@ -42,7 +42,7 @@ public class IfProductOffLine extends BaseBean {
@Column(name = "QTY")
@ApiParam("数量")
private String qty;
private Double qty;
@Column(name = "UNIT")
@ApiParam("单位")

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

@ -43,10 +43,24 @@ public class MesDefect extends BaseBean {
private String defectType;
@Transient
@ApiParam("缺陷类型名称")
private String defectTypeName;
@Transient
@ApiParam("缺陷位置")
private String defectLocation;
@Transient
@ApiParam("缺陷类型子集")
private List<MesDefect> mesDefectList;
public MesDefect() {
}
public MesDefect(String defectCode, String defectName, String defectType, String defectTypeName) {
this.defectCode = defectCode;
this.defectName = defectName;
this.defectType = defectType;
this.defectTypeName = defectTypeName;
}
}

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

@ -56,7 +56,7 @@ public class MesDismantleRecord extends BaseBean {
@Column(name = "QTY")
@ApiParam("产品数量")
private Integer qty;
private Double qty;
@Column(name = "DISMANTLE_QTY")
@ApiParam("拆解数")

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

@ -132,6 +132,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("操作类型")
private Integer operateType;
@Transient
@ApiParam("下线时间开始")
private String outWorkCenterTimeStart;
@Transient
@ApiParam("下线时间截止")
private String outWorkCenterTimeEnd;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
@ -178,9 +186,12 @@ public class MesProduceSn extends BaseBean implements Serializable {
", workOrderNo='" + workOrderNo + '\'' +
", custSn='" + custSn + '\'' +
", custPartNo='" + custPartNo + '\'' +
", snType='" + snType + '\'' +
", snType=" + snType +
", tray='" + tray + '\'' +
", resultMsg='" + resultMsg + '\'' +
", operateType=" + operateType +
", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' +
", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' +
'}';
}
}

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

@ -34,4 +34,12 @@ public class MesShiftGroup extends BaseBean {
@Column(name = "GROUP_NAME")
@ApiParam("班组名称")
private String groupName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "SQUAD_LEADER")
@ApiParam("班长")
private String squadLeader;
}

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

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\22 16:56
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_TYPE_CFG")
@Api("类型信息表")
public class MesTypeCfg extends BaseBean {
@Column(name = "TYPE_CODE")
@ApiParam("类型代码")
private String typeCode;
@Column(name = "TYPE_NAME")
@ApiParam("类型名称")
private String typeName;
@Column(name = "BUSINESS_TYPE_CODE")
@ApiParam("业务类型代码")
private String businessTypeCode;
@Column(name = "BUSINESS_TYPE_NAME")
@ApiParam("业务类型名称")
private String businessTypeName;
}

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

@ -26,6 +26,10 @@ public class MesDefectModel {
private String defectType;
@Transient
@ApiParam("缺陷类型名称")
private String defectTypeName;
@Transient
@ApiParam("缺陷分类子集")
private List<MesDefect> mesDefectList;
}

10
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java → modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java
Unescape Escape View File

@ -1,6 +1,6 @@
package cn.estsh.i3plus.pojo.mes.model;
package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -8,18 +8,18 @@ import lombok.Data;
import java.util.List;
/**
* @Description: 打印信息封装模板
* @Description: 打印信息封装
* @Reference:
* @Author: wangjie
* @CreateDate:2019-08-27-13:24
* @Modify:
**/
@Data
@Api("打印信息封装模板")
@Api("打印信息封装")
public class SnPrintDataModel {
@ApiParam("打印数据")
private List<SnPrintValueModel> snPrintValueModel;
private List<StepPrintSnModel> valueList;
@ApiParam("打印模板及参数")
private MesLabelTemplate labelTemplate;

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

@ -0,0 +1,27 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description: 打印信息汇总
* @Reference:
* @Author: wangjie
* @CreateDate:2019-08-27-13:24
* @Modify:
**/
@Data
@Api("打印信息汇总")
public class SnPrintModel extends StepPrintSnModel {
@ApiParam("过程条码")
private SnPrintDataModel serialPrintDataModel;
@ApiParam("产品条码")
private SnPrintDataModel prodPrintDataModel;
@ApiParam("包装条码")
private SnPrintDataModel packPrintDataModel;
}

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -72,4 +73,7 @@ public class StepPrintSnModel extends MesProduceSn {
@ApiParam("生产线代码")
private String workCenterCode;
@ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层")
private Integer packLevel;
}

130
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -6,7 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.pcn.bean.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.StringUtils;
/**
* @Description:
@ -54,13 +54,13 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesConfig.getCfgCode())) {
if (!StringUtils.isEmpty(mesConfig.getCfgCode())) {
DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
}
if (StringUtils.isNotEmpty(mesConfig.getCfgName())) {
if (!StringUtils.isEmpty(mesConfig.getCfgName())) {
DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
}
if (mesConfig.getIsValid() != null) {
if (!StringUtils.isEmpty(mesConfig.getIsValid())) {
DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean);
}
return packBean;
@ -120,34 +120,34 @@ public class MesHqlPack {
*/
public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesWorkOrder.getOrderNo())) {
if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getPartNo())) {
if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) {
if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) {
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) {
if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
}
if (mesWorkOrder.getApprovalStatus() != null) {
if (!StringUtils.isEmpty(mesWorkOrder.getApprovalStatus())) {
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) {
if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) {
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getCustOrderNo())) {
if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) {
if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getCreateUser())) {
if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean);
}
if (mesWorkOrder.getIsValid() != null) {
if (!StringUtils.isEmpty(mesWorkOrder.getIsValid())) {
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean);
}
@ -181,19 +181,19 @@ public class MesHqlPack {
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
if (StringUtils.isNotEmpty(mesPart.getPartNo())) {
if (!StringUtils.isEmpty(mesPart.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getPartName())) {
if (!StringUtils.isEmpty(mesPart.getPartName())) {
DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getCategoryCode1())) {
if (!StringUtils.isEmpty(mesPart.getCategoryCode1())) {
DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getCategoryCode2())) {
if (!StringUtils.isEmpty(mesPart.getCategoryCode2())) {
DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getCategoryCode3())) {
if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) {
DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean);
}
@ -210,10 +210,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode);
if (StringUtils.isNotEmpty(customer.getCustomerCode())) {
if (!StringUtils.isEmpty(customer.getCustomerCode())) {
DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean);
}
if (StringUtils.isNotEmpty(customer.getCustomerName())) {
if (!StringUtils.isEmpty(customer.getCustomerName())) {
DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean);
}
@ -228,13 +228,13 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesRepair.getRepairCode())) {
if (!StringUtils.isEmpty(mesRepair.getRepairCode())) {
DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean);
}
if (StringUtils.isNotEmpty(mesRepair.getRepairName())) {
if (!StringUtils.isEmpty(mesRepair.getRepairName())) {
DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean);
}
if (mesRepair.getRepairType() != null) {
if (!StringUtils.isEmpty(mesRepair.getRepairType())) {
DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean);
}
return packBean;
@ -248,13 +248,13 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesScrap.getScrapCode())) {
if (!StringUtils.isEmpty(mesScrap.getScrapCode())) {
DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean);
}
if (StringUtils.isNotEmpty(mesScrap.getScrapName())) {
if (!StringUtils.isEmpty(mesScrap.getScrapName())) {
DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean);
}
if (StringUtils.isNotEmpty(mesScrap.getScrapType())) {
if (!StringUtils.isEmpty(mesScrap.getScrapType())) {
DdlPreparedPack.getStringLikerPack(mesScrap.getScrapType(), "scrapType", packBean);
}
return packBean;
@ -268,16 +268,86 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesDefectCause(MesDefectCause mesDefectCause, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesDefectCause.getDcCode())) {
if (!StringUtils.isEmpty(mesDefectCause.getDcCode())) {
DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcCode(), "dcCode", packBean);
}
if (StringUtils.isNotEmpty(mesDefectCause.getDcName())) {
if (!StringUtils.isEmpty(mesDefectCause.getDcName())) {
DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcName(), "dcName", packBean);
}
if (mesDefectCause.getDcType() != null) {
if (!StringUtils.isEmpty(mesDefectCause.getDcType())) {
DdlPreparedPack.getNumEqualPack(mesDefectCause.getDcType(), "dcType", packBean);
}
return packBean;
}
/**
* 按条件分页查询产品条码补打印数据
* @param mesProduceSn
* @return
*/
public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode());
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
}
// 时间段查询
DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeStart(),
mesProduceSn.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
DdlPreparedPack.timeBuilder(
mesProduceSn.getOutWorkCenterTimeStart(),
mesProduceSn.getOutWorkCenterTimeEnd(),
"outWorkCenterTime", packBean, true);
return packBean;
}
/**
* 按条件分页查询包装条码补打印数据
* @param mesPackage
* @return
*/
public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) {
DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode());
if (!StringUtils.isEmpty(mesPackage.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesPackage.getPackLevel())) {
DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean);
}
if (!StringUtils.isEmpty(mesPackage.getPackageNo())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
}
if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
}
// 时间段查询
DdlPreparedPack.timeBuilder(
mesPackage.getCreateDateTimeStart(),
mesPackage.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
return packBean;
}
}

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

@ -55,7 +55,7 @@ public class IfDismantleRecord extends BaseBean {
@Column(name = "QTY")
@ApiParam("产品数量")
private Integer qty;
private Double qty;
@Column(name = "DISMANTLE_QTY")
@ApiParam("拆解数")

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

@ -50,7 +50,7 @@ public class IfPackageDetail extends BaseBean {
@Column(name = "QTY")
@ApiParam("数量")
private String qty;
private Double qty;
@Column(name = "PACKAGE_NO2")
@ApiParam("包装编号2")

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

@ -42,7 +42,7 @@ public class IfProductOffLine extends BaseBean {
@Column(name = "QTY")
@ApiParam("数量")
private String qty;
private Double qty;
@Column(name = "UNIT")
@ApiParam("单位")

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

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description:
@ -39,4 +40,20 @@ public class MesPartObject extends BaseBean {
@Column(name = "OBJECT_NAME")
@ApiParam("物料名称")
private String objectName;
@Transient
@ApiParam("产品条码")
private String productSn;
@Transient
@ApiParam("产品条码")
private String serialNumber;
@Transient
@ApiParam("字段总数")
private Integer fieldNum;
@Transient
@ApiParam("数据组号")
private String groupNo;
}

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

@ -129,15 +129,6 @@ public class MesProduceSn extends BaseBean {
@ApiParam("返回信息")
private String resultMsg;
@Transient
@ApiParam("下线时间开始")
private String outWorkCenterTimeStart;
@Transient
@ApiParam("下线时间截止")
private String outWorkCenterTimeEnd;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
@ -184,11 +175,10 @@ public class MesProduceSn extends BaseBean {
", workOrderNo='" + workOrderNo + '\'' +
", custSn='" + custSn + '\'' +
", custPartNo='" + custPartNo + '\'' +
", snType='" + snType + '\'' +
", snType=" + snType +
", tray='" + tray + '\'' +
", operateType=" + operateType +
", resultMsg='" + resultMsg + '\'' +
", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' +
", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' +
'}';
}
}

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

@ -45,9 +45,17 @@ public class MesProductData extends BaseBean {
private String workCellName;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "ORDER_NO")
@ApiParam("工单号")
private String orderNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;

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

@ -34,4 +34,12 @@ public class MesShiftGroup extends BaseBean {
@Column(name = "GROUP_NAME")
@ApiParam("班组名称")
private String groupName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "SQUAD_LEADER")
@ApiParam("班长")
private String squadLeader;
}

35
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataSyncExtractConditionModel.java
Unescape Escape View File

@ -0,0 +1,35 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Author: wangjie
* @CreateDate: 2019/8/21 9:19 AM
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("MesPcnSyncCfg数据同步抽取条件model")
public class DataSyncExtractConditionModel implements Serializable {
@ApiParam("字段")
private String field;
@ApiParam("条件")
private String condition;
@ApiParam("值")
private Object value;
@ApiParam("数据类型")
private Integer innerType;
}

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesExcelErrorModel.java → modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelImportErrorModel.java
Unescape Escape View File

@ -18,7 +18,7 @@ import java.io.Serializable;
@NoArgsConstructor
@AllArgsConstructor
@Api("mes导入异常结果model")
public class MesExcelErrorModel implements Serializable {
public class ExcelImportErrorModel implements Serializable {
@ApiParam("错误的行号")
private int rowNum;

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesExcelResultModel.java → modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelImportResultModel.java
Unescape Escape View File

@ -19,7 +19,7 @@ import java.util.List;
@NoArgsConstructor
@AllArgsConstructor
@Api("mes导入结果model")
public class MesExcelResultModel<T> implements Serializable {
public class ExcelImportResultModel<T> implements Serializable {
@ApiParam("结果")
private boolean result;
@ -31,7 +31,7 @@ public class MesExcelResultModel<T> implements Serializable {
private int failRowNum;
@ApiParam("错误信息集合")
private List<MesExcelErrorModel> mesExcelErrorModel;
private List<ExcelImportErrorModel> excelImportErrorModels;
@ApiParam("错误的行号")
private String errorRows;

27
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java
Unescape Escape View File

@ -1,27 +0,0 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description: 条码补打印
* @Reference:
* @Author: wangjie
* @CreateDate:2019-08-27-13:24
* @Modify:
**/
@Data
@Api("打印信息模板")
public class SnPrintModel extends SnPrintValueModel {
@ApiParam("过程条码")
private SnPrintDataModel snPrintModel;
@ApiParam("产品条码")
private SnPrintDataModel prodPrintModel;
@ApiParam("包装条码")
private SnPrintDataModel packagePrintModel;
}

72
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java
Unescape Escape View File

@ -1,72 +0,0 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description: 条码补打印
* @Reference:
* @Author: wangjie
* @CreateDate:2019-08-27-13:24
* @Modify:
**/
@Data
@Api("打印信息模板")
public class SnPrintValueModel extends MesProduceSn {
@ApiParam("打印描述")
private String printDesc;
@ApiParam("条码")
private String barCode;
@ApiParam("物料号")
private String partNo;
@ApiParam("批次号")
private String batchNo;
@ApiParam("箱数量")
private String boxQty;
@ApiParam("订单号")
private String orderNo;
@ApiParam("生产日期")
private String productionTime;
@ApiParam("包装编码")
private String packageNo;
@ApiParam("包装规格")
private String packageSpec;
@ApiParam("供应商")
private String supplier;
@ApiParam("客户名称")
private String customerName;
@ApiParam("客户零件号")
private String customerPartNo;
@ApiParam("客户物料名称")
private String customerPartName;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("单位")
private String unit;
@ApiParam("特殊批号")
private String fixLotNo;
@ApiParam("生产工单号")
private String workOrderNo;
@ApiParam("生产线代码")
private String workCenterCode;
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPartObject;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\21 17:06
* @Modify:
**/
public interface MesPartObjectRepository extends BaseRepository<MesPartObject, Long> {
}

69
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -1923,73 +1923,4 @@ public class MesHqlPack {
return packBean;
}
/**
* 按条件分页查询产品条码补打印数据
* @param mesProduceSn
* @return
*/
public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
DdlPackBean packBean = getMesAllData(mesProduceSn.getOrganizeCode());
if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
}
// 时间段查询
DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeStart(),
mesProduceSn.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
DdlPreparedPack.timeBuilder(
mesProduceSn.getOutWorkCenterTimeStart(),
mesProduceSn.getOutWorkCenterTimeEnd(),
"outWorkCenterTime", packBean, true);
return packBean;
}
/**
* 按条件分页查询包装条码补打印数据
* @param mesPackage
* @return
*/
public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) {
DdlPackBean packBean = getMesAllData(mesPackage.getOrganizeCode());
if (!StringUtils.isEmpty(mesPackage.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesPackage.getPackLevel())) {
DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean);
}
if (!StringUtils.isEmpty(mesPackage.getPackageNo())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
}
if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
}
// 时间段查询
DdlPreparedPack.timeBuilder(
mesPackage.getCreateDateTimeStart(),
mesPackage.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
return packBean;
}
}

2
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java
Unescape Escape View File

@ -17,6 +17,8 @@ public class Task {
private String code;
private String stepCode;
@XStreamCDATA
private Object paramList;
}

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

@ -56,12 +56,15 @@ public class WmsTaskInfoModel implements Serializable {
@ApiParam(value = "创建日期")
public String createDatetime;
@ApiParam(value = "创建人")
public String createUser;
public WmsTaskInfoModel() {
}
public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo,
String createDatetime, String srcZoneNo) {
String createDatetime, String srcZoneNo, String createUser) {
this.orderNo = orderNo;
this.taskStatus = taskStatus;
this.opTypeName = opTypeName;
@ -74,5 +77,6 @@ public class WmsTaskInfoModel implements Serializable {
this.vendorNo = vendorNo;
this.createDatetime = createDatetime;
this.srcZoneNo = srcZoneNo;
this.createUser = createUser;
}
}

35
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -73,26 +73,21 @@ public class CoreHqlPack {
/**
* 资源查询
* @param localeResource
* @param resource
* @return
*/
public static String packHqlSysLocaleResource(SysLocaleResource localeResource){
StringBuffer result = new StringBuffer();
//查询日期
// HqlPack.timeBuilder(sysLocaleResource.getCreateDateTimeStart(),sysLocaleResource.getCreateDateTimeEnd(),
// "createDateTime", result, false);
//数字类型封装
HqlPack.getNumEqualPack(localeResource.getResourceType(),"resourceType",result);
//字符串类型封装
HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result);
//字符串类型封装
HqlPack.getStringLikerPack(localeResource.getResourceKey(),"resourceKey",result);
public static DdlPackBean packHqlSysLocaleResource(SysLocaleResource resource){
DdlPackBean result = DdlPackBean.getDdlPackBean();
// 添加默认排序
HqlPack.getOrderDefault(localeResource);
if(resource != null){
DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result);
DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result);
DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result);
DdlPreparedPack.getStringEqualPack(resource.getResourceKey(),"resourceKey",result);
DdlPreparedPack.getStringLikerPack(resource.getResourceValue(),"resourceValue",result);
}
return result.toString();
return result;
}
/**
@ -265,6 +260,14 @@ public class CoreHqlPack {
DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result);
result.setOrderByStr(menu.orderBy());
}else {
menu = new SysMenu();
}
if(!StringUtils.isNotBlank(menu.getOrderByParam())){
menu.setOrderByParam("menuSort");
menu.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue());
result.setOrderByStr(menu.orderBy());
}
return result;

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

@ -60,8 +60,4 @@ public class BasCustomer extends BaseBean {
@Column(name = "CUST_FAX")
@ApiParam(value = "传真")
private String custFax;
@Column(name = "SHIPP_QTY")
@ApiParam(value = "发运数量控制")
private Integer shippQty;
}

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

@ -53,4 +53,8 @@ public class SwebProcurementPlanOrder extends BaseBean {
@ApiParam(value = "是否寄售")
private Integer consignment=2;
@Column(name = "organize_code")
@ApiParam(value = "组织代码")
private String organizeCode;
}

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

@ -99,6 +99,10 @@ public class WmsCSOrderMaster extends BaseBean {
@ApiParam(value = "盘点库位清单")
public String[] wmsCSLocates;
@ApiParam(value = "是否明盘 1-是 2-否")
@Column(name = "is_obvious")
private Integer isObvious;
public Integer getIsInventoryVal() {
return this.isInventory == null ? 0 :this.isInventory.intValue();
}

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

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
@ -51,6 +52,7 @@ public class WmsConfig extends BaseBean {
@ApiParam(value ="参数值类型")
private String configValueType;
@Lob
@Column(name="CONFIG_VALUE")
@ApiParam(value ="参数值")
private String configValue;

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

@ -151,6 +151,10 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam(value = "计划日期")
private String assignPlanDate;
@Column(name = "FLAG_NO")
@ApiParam(value = "客户发往地编号")
private String flagNo;
@Column(name = "PLAN_TIME")
@ApiParam(value = "计划时间")
private String assignPlanTime;

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

@ -29,7 +29,6 @@ import javax.persistence.Transient;
@Api("包装规格")
public class WmsPackageSpec extends BaseBean {
private static final long serialVersionUID = 4849044986767609445L;
@Column(name = "SPEC_CODE",unique = true)
@ApiParam(value = "包装规格代码")
private String specCode;

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

@ -29,20 +29,29 @@ import javax.persistence.Table;
public class WmsShippingFlag extends BaseBean {
private static final long serialVersionUID = 8034283413609254479L;
@Column(name = "CUST_NO")
@ApiParam(value = "客户编号")
private String custNo;
@Column(name = "FLAG_NO")
@ApiParam(value = "编号")
@ApiParam(value = "客户发往地编号")
private String flagNo;
@Column(name = "FLAG_NAME")
@ApiParam(value = "简称")
@ApiParam(value = "客户发往地名称")
private String flagName;
@Column(name = "SHIPP_QTY")
@ApiParam(value = "发运数量控制")
private Integer shippQty;
@Column(name = "FLAG_DESC")
@ApiParam(value = "全称")
private String flagDesc;
@Column(name = "FLAG_ADDR")
@ApiParam(value = "地址")
@ApiParam(value = "客户发往地址")
private String flagAddr;
@Column(name = "FLAG_OWNER")

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

@ -66,25 +66,29 @@ public class WmsStockSn extends BaseBean {
private String partNameRdd;
@Column(name = "LOT_NO", nullable = false)
@ApiParam("收货日期（批次编码）")
@ApiParam("收货批次")
public String lotNo = "";
@Column(name = "DATE_CODE", nullable = false)
@ApiParam(value = "生产日期")
@ApiParam(value = "供应商批次")
public String dateCode = "";
@Column(name = "FIX_LOT_NO", nullable = false)
@ApiParam(value = "特殊批次")
private String fixLotNo = "";
@Column(name = "QUALITY_DATE")
@ApiParam("保质期")
private String qualityDate;
@Column(name = "LEFT_CODE", nullable = false)
@ApiParam(value = "有效期")
@ApiParam(value = "生产批次")
private String leftCode = "";
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编码")
public String vendorNo;
@Column(name = "FIX_LOT_NO", nullable = false)
@ApiParam(value = "特殊批次")
private String fixLotNo = "";
@Column(name = "CUST_NO")
@ApiParam(value = "客户编码")
private String custNo;
@ -163,10 +167,6 @@ public class WmsStockSn extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")
private Integer snType = 10;
@Column(name = "QUALITY_DATE")
@ApiParam("保质期日期")
private String qualityDate;
@ApiParam(value = "仓库名称")
@Transient
public String whNameRdd;
@ -330,11 +330,12 @@ public class WmsStockSn extends BaseBean {
this.qty = qty;
}
public WmsStockSn(String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
public WmsStockSn(Long id,String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo,
String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd,
String qualityDate, String custNo, String lotCheckRule, String sn2d,
String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser) {
this.id = id;
this.sn = sn;
this.partNo = partNo;
this.partNameRdd = partNameRdd;

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

@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.*;
import java.math.BigDecimal;
/**
@ -31,7 +28,7 @@ import java.math.BigDecimal;
@Index(columnList = "ORDER_NO"),
@Index(columnList = "PART_NO"),
@Index(columnList = "ITEM_STATUS")
})
}, uniqueConstraints = {@UniqueConstraint(columnNames = {"REF_SRC", "ITEM", "TRANS_TYPE_CODE_RDD"})})
@Api("作业任务明细信息")
public class WmsTaskDetails extends BaseBean {
@ -143,6 +140,10 @@ public class WmsTaskDetails extends BaseBean {
@ApiParam("业务类型描述")
public String busiTypeDesc;
@Column(name = "TRANS_TYPE_CODE_RDD")
@ApiParam("交易类型")
public String transTypeCodeRdd;
public Double getQty() {
return this.qty == null ? 0 : this.qty;
}

21
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java
Unescape Escape View File

@ -12,11 +12,24 @@ public class WmsPartQtyDto {
@ApiParam(value = "物料名称")
private String partName;
@ApiParam(value = "物料编码")
private String partNO;
private String partNo;
@ApiParam(value = "应收数量")
private String qty;
private Double qty;
@ApiParam(value = "实收数量")
private String rcQty;
private Double rcQty;
@ApiParam(value = "待收数量")
private String dueQty;
private Double dueQty;
public Double getQty() {
return qty == null? 0.0:qty;
}
public Double getRcQty() {
return rcQty == null? 0.0:qty;
}
public Double getDueQty() {
return dueQty == null? 0.0:qty;
}
}

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

@ -153,6 +153,26 @@ public class WmsHqlPack {
}
/**
* 开口合同查询封装
*
* @param swebProcurementPlanOrder
* @return
*/
public static DdlPackBean packSwebProcurementPlanOrder(SwebProcurementPlanOrder swebProcurementPlanOrder) {
DdlPackBean packBean = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean);
DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean);
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean);
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean);
DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean);
getStringBuilderPack(swebProcurementPlanOrder, packBean);
return packBean;
}
/**
* 库存移动单查询封装
*
* @param wmsDocMovementMaster

Write Preview
Loading…
Cancel
Save