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

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

Browse Source
yun-zuoyi
gcj 5 years ago
parent 49134cc5b3 eb084d3904
commit a7d1ec785b
15 changed files with 185 additions and 111 deletions
Show Stats Download Patch File Download Diff File

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

@ -730,6 +730,10 @@ public class AndonEnumUtil {
/** /**
* 按灯标识 * 按灯标识
* 1-呼叫，2-签到，3-解决 * 1-呼叫，2-签到，3-解决
*
* 20190917将“提交”更改为“解决待审”
* 20190917将“审批”更改为“审批完成”
* 20190917增加"撤销已确认"枚举
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_ACTION_TAG { public enum ANDON_ACTION_TAG {
@ -737,10 +741,10 @@ public class AndonEnumUtil {
SIGN(2,"20","响应"), SIGN(2,"20","响应"),
RESOLVE(3,"30","解决"), RESOLVE(3,"30","解决"),
CANCEL(4,"40", "撤销"), CANCEL(4,"40", "撤销"),
COMMIT(5,"50","解决待审"),// 20190917将“提交”更改为“解决待审” COMMIT(5,"50","解决待审"),
PASS(6,"60","审批完成"), // 20190917将“审批”更改为“审批完成” PASS(6,"60","审批完成"),
REJECT(7,"70","驳回"), REJECT(7,"70","驳回"),
CONFIRMED_CANCEL(8,"80","撤销已确认"); // 20190917增加这个枚举 CONFIRMED_CANCEL(8,"80","撤销已确认");
private int value; private int value;
private String code; private String code;
@ -944,10 +948,11 @@ public class AndonEnumUtil {
/** /**
* ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测
*
* 下面的顺序不要更改，packBrokenTimeTypeRatioList方法有用到此枚举的顺序
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_TYPE { public enum ALARM_TYPE {
//下面的顺序不要更改，packBrokenTimeTypeRatioList方法有用到此枚举的顺序
EQUIP("EQUMENT_ALARM", 110060106, "设备", "#D06D6A"), EQUIP("EQUMENT_ALARM", 110060106, "设备", "#D06D6A"),
QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"), QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"),
PART("PART_ALARM", 110060104, "物料", "#24BDBA"), PART("PART_ALARM", 110060104, "物料", "#24BDBA"),

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

@ -146,11 +146,12 @@ public class CommonEnumUtil {
} }
return null; return null;
} }
public static int descriptionOfValue(String desc) { public synchronized static int descriptionOfValue(String desc) {
int tmp = IMPP.value; int tmp = IMPP.value;
for (int i = 0; i < values().length; i++) { for (int i = 0; i < values().length; i++) {
if (values()[i].name().equals(desc)) { if (values()[i].description.equals(desc)) {
tmp = values()[i].value; tmp = values()[i].value;
break;
} }
} }
return tmp; return tmp;

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

@ -487,15 +487,18 @@ public class MesEnumUtil {
return value; return value;
} }
public String getCode() {
return code;
}
public String getDescription() { public String getDescription() {
return description; return description;
} }
// 根据value返回枚举类型,主要在switch中使用
public static ORGANIZATION_INIT_DATA getByValue(String value) { public static ORGANIZATION_INIT_DATA getByValue(String value) {
for (ORGANIZATION_INIT_DATA mesInsertExcel : values()) { for (ORGANIZATION_INIT_DATA organizationInitData : values()) {
if (mesInsertExcel.getValue().equals(value)) { if (organizationInitData.getValue().equals(value)) {
return mesInsertExcel; return organizationInitData;
} }
} }
return null; return null;
@ -1484,7 +1487,6 @@ public class MesEnumUtil {
return description; return description;
} }
// 根据value返回枚举类型,主要在switch中使用
public static MES_INSERT_EXCEL getByValue(int value) { public static MES_INSERT_EXCEL getByValue(int value) {
for (MES_INSERT_EXCEL mesInsertExcel : values()) { for (MES_INSERT_EXCEL mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) { if (mesInsertExcel.getValue() == value) {
@ -1643,7 +1645,6 @@ public class MesEnumUtil {
return description; return description;
} }
// 根据value返回枚举类型,主要在switch中使用
public static MES_STATION_BOM_IS_REPEAT getByValue(int value) { public static MES_STATION_BOM_IS_REPEAT getByValue(int value) {
for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) { for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) { if (mesInsertExcel.getValue() == value) {
@ -1842,7 +1843,6 @@ public class MesEnumUtil {
return description; return description;
} }
// 根据value返回枚举类型,主要在switch中使用
public static MES_WORK_CELL_TYPE getByValue(int value) { public static MES_WORK_CELL_TYPE getByValue(int value) {
for (MES_WORK_CELL_TYPE mesInsertExcel : values()) { for (MES_WORK_CELL_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) { if (mesInsertExcel.getValue() == value) {
@ -1900,7 +1900,6 @@ public class MesEnumUtil {
return description; return description;
} }
// 根据value返回枚举类型,主要在switch中使用
public static MES_ACTION_TYPE getByValue(int value) { public static MES_ACTION_TYPE getByValue(int value) {
for (MES_ACTION_TYPE mesInsertExcel : values()) { for (MES_ACTION_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) { if (mesInsertExcel.getValue() == value) {
@ -1948,7 +1947,6 @@ public class MesEnumUtil {
return description; return description;
} }
// 根据value返回枚举类型,主要在switch中使用
public static MES_IS_BIND_KEY getByValue(int value) { public static MES_IS_BIND_KEY getByValue(int value) {
for (MES_IS_BIND_KEY mesInsertExcel : values()) { for (MES_IS_BIND_KEY mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) { if (mesInsertExcel.getValue() == value) {
@ -1996,7 +1994,6 @@ public class MesEnumUtil {
return description; return description;
} }
// 根据value返回枚举类型,主要在switch中使用
public static MES_REPAIR_STATUS getByValue(int value) { public static MES_REPAIR_STATUS getByValue(int value) {
for (MES_REPAIR_STATUS mesInsertExcel : values()) { for (MES_REPAIR_STATUS mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) { if (mesInsertExcel.getValue() == value) {
@ -2047,7 +2044,6 @@ public class MesEnumUtil {
return description; return description;
} }
// 根据value返回枚举类型,主要在switch中使用
public static MES_OPERATE_TYPE getByValue(int value) { public static MES_OPERATE_TYPE getByValue(int value) {
for (MES_OPERATE_TYPE mesInsertExcel : values()) { for (MES_OPERATE_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) { if (mesInsertExcel.getValue() == value) {

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

@ -75,7 +75,6 @@ public class MesPcnEnumUtil {
return description; return description;
} }
// 根据value返回枚举类型,主要在switch中使用
public static MES_STATION_BOM_IS_REPEAT getByValue(int value) { public static MES_STATION_BOM_IS_REPEAT getByValue(int value) {
for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) { for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) { if (mesInsertExcel.getValue() == value) {
@ -193,7 +192,6 @@ public class MesPcnEnumUtil {
return description; return description;
} }
// 根据value返回枚举类型,主要在switch中使用
public static MES_ACTION_TYPE getByValue(int value) { public static MES_ACTION_TYPE getByValue(int value) {
for (MES_ACTION_TYPE mesInsertExcel : values()) { for (MES_ACTION_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) { if (mesInsertExcel.getValue() == value) {
@ -281,7 +279,6 @@ public class MesPcnEnumUtil {
return description; return description;
} }
// 根据value返回枚举类型,主要在switch中使用
public static MES_IS_BIND_KEY getByValue(int value) { public static MES_IS_BIND_KEY getByValue(int value) {
for (MES_IS_BIND_KEY mesInsertExcel : values()) { for (MES_IS_BIND_KEY mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) { if (mesInsertExcel.getValue() == value) {
@ -405,7 +402,6 @@ public class MesPcnEnumUtil {
return description; return description;
} }
// 根据value返回枚举类型,主要在switch中使用
public static MES_OPERATE_TYPE getByValue(int value) { public static MES_OPERATE_TYPE getByValue(int value) {
for (MES_OPERATE_TYPE mesInsertExcel : values()) { for (MES_OPERATE_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) { if (mesInsertExcel.getValue() == value) {
@ -466,7 +462,6 @@ public class MesPcnEnumUtil {
return tmp; return tmp;
} }
// 根据value返回枚举类型,主要在switch中使用
public static MES_MATCH_TYPE getByValue(int value) { public static MES_MATCH_TYPE getByValue(int value) {
for (MES_MATCH_TYPE mesMatchType : values()) { for (MES_MATCH_TYPE mesMatchType : values()) {
if (mesMatchType.getValue() == value) { if (mesMatchType.getValue() == value) {

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

@ -110,6 +110,7 @@ public class WmsEnumUtil {
/** /**
* 移库单主表：优先级 * 移库单主表：优先级
*/ */
@Deprecated
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRIORITY { public enum PRIORITY {
NORMAL(1, "正常"), URGENT(2, "紧急"); NORMAL(1, "正常"), URGENT(2, "紧急");
@ -142,6 +143,38 @@ public class WmsEnumUtil {
/** /**
* 移库单主表：优先级 (PRIORITY_NEW)
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRIORITY_NEW {
URGENT(1, "紧急"), NORMAL(2, "正常");
private int value;
private String description;
PRIORITY_NEW(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
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;
}
}
/**
* 主表信息 单据类型 * 主表信息 单据类型
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -205,7 +238,8 @@ public class WmsEnumUtil {
RECEIPT(20, "RECEIPT", "处理中"), RECEIPT(20, "RECEIPT", "处理中"),
RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
CLOSED(40, "CLOSED", "已关闭"), CLOSED(40, "CLOSED", "已关闭"),
CANCELLED(50, "CANCELLED", "已取消"); CANCELLED(50, "CANCELLED", "已取消"),
FINISH_PRODUCT_SHIPING_PICKED(60, "FINISH_PRODUCT_SHIPING_PICKED", "配料完成");
private int value; private int value;
private String code; private String code;
@ -1315,7 +1349,8 @@ public class WmsEnumUtil {
INVENTORY(20, "已盘"), INVENTORY(20, "已盘"),
FROZEN(30, "已冻结"), FROZEN(30, "已冻结"),
THAWING(40, "已解冻"), THAWING(40, "已解冻"),
RETURN_GOODS(50, "取消冻结"); RETURN_GOODS(50, "取消冻结"),
Unsettled_(60, "取消冻结");
private int value; private int value;
private String description; private String description;

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

@ -39,10 +39,18 @@ public class MesPcn extends BaseBean {
@ApiParam("区域") @ApiParam("区域")
private String areaCode; private String areaCode;
@Column(name = "AREA_NAME")
@ApiParam("区域名称")
private String areaName;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心") @ApiParam("工作中心")
private String workCenterCode; private String workCenterCode;
@Column(name = "WORK_CENTER_NAME")
@ApiParam("工作中心名称")
private String workCenterName;
@Column(name = "PCN_VERSION") @Column(name = "PCN_VERSION")
@ApiParam("PCN版本") @ApiParam("PCN版本")
private String pcnVersion; private String pcnVersion;

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

@ -155,18 +155,24 @@ public class MesHqlPack {
} }
// 时间段查询 // 时间段查询
DdlPreparedPack.timeBuilder( if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
mesWorkOrder.getStartTimeStart(), DdlPreparedPack.timeBuilder(
mesWorkOrder.getStartTimeEnd(), mesWorkOrder.getStartTimeStart(),
"startTime", packBean, true); mesWorkOrder.getStartTimeEnd(),
DdlPreparedPack.timeBuilder( "startTime", packBean, true);
mesWorkOrder.getEndTimeStart(), }
mesWorkOrder.getEndTimeEnd(), if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) {
"endTime", packBean, true); DdlPreparedPack.timeBuilder(
DdlPreparedPack.timeBuilder( mesWorkOrder.getEndTimeStart(),
mesWorkOrder.getCreateDateTimeStart(), mesWorkOrder.getEndTimeEnd(),
mesWorkOrder.getCreateDateTimeEnd(), "endTime", packBean, true);
"createDatetime", packBean, true); }
if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getCreateDateTimeStart(),
mesWorkOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
DdlPreparedPack.getOrderDefault(mesWorkOrder); DdlPreparedPack.getOrderDefault(mesWorkOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
return packBean; return packBean;
@ -290,32 +296,35 @@ public class MesHqlPack {
*/ */
public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) { public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode()); DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode());
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
} }
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getProductSn())) { if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
} }
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getPartNo())) { if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
} }
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSnStatus())) { if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
} }
// 时间段查询 // 时间段查询
DdlPreparedPack.timeBuilder( if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) {
mesProduceSn.getCreateDateTimeStart(), DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeEnd(), mesProduceSn.getCreateDateTimeStart(),
"createDatetime", packBean, true); mesProduceSn.getCreateDateTimeEnd(),
DdlPreparedPack.timeBuilder( "createDatetime", packBean, true);
mesProduceSn.getOutWorkCenterTimeStart(), }
mesProduceSn.getOutWorkCenterTimeEnd(), if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
"outWorkCenterTime", packBean, true); DdlPreparedPack.timeBuilder(
mesProduceSn.getOutWorkCenterTimeStart(),
mesProduceSn.getOutWorkCenterTimeEnd(),
"outWorkCenterTime", packBean, true);
}
return packBean; return packBean;
} }

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

@ -39,10 +39,18 @@ public class MesPcn extends BaseBean {
@ApiParam("区域") @ApiParam("区域")
private String areaCode; private String areaCode;
@Column(name = "AREA_NAME")
@ApiParam("区域")
private String areaName;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心") @ApiParam("工作中心")
private String workCenterCode; private String workCenterCode;
@Column(name = "WORK_CENTER_NAME")
@ApiParam("工作中心")
private String workCenterName;
@Column(name = "PCN_VERSION") @Column(name = "PCN_VERSION")
@ApiParam("PCN版本") @ApiParam("PCN版本")
private String pcnVersion; private String pcnVersion;

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

@ -50,6 +50,9 @@ public class MesPartObjectModel {
@ApiParam("对象名称") @ApiParam("对象名称")
private String objectName; private String objectName;
public MesPartObjectModel() {
}
public MesPartObjectModel(Long id, String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer isValid, Integer isDeleted, String partNo, String objectCode, String workCenterCode, String objectName) { public MesPartObjectModel(Long id, String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer isValid, Integer isDeleted, String partNo, String objectCode, String workCenterCode, String objectName) {
this.id = id; this.id = id;
this.organizeCode = organizeCode; this.organizeCode = organizeCode;

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

@ -84,18 +84,24 @@ public class MesHqlPack {
} }
// 时间段查询 // 时间段查询
DdlPreparedPack.timeBuilder( if (!StringUtil.isEmpty(mesPlanOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getStartTimeEnd())) {
mesPlanOrder.getStartTimeStart(), DdlPreparedPack.timeBuilder(
mesPlanOrder.getStartTimeEnd(), mesPlanOrder.getStartTimeStart(),
"startTime", packBean, true); mesPlanOrder.getStartTimeEnd(),
DdlPreparedPack.timeBuilder( "startTime", packBean, true);
mesPlanOrder.getEndTimeStart(), }
mesPlanOrder.getEndTimeEnd(), if (!StringUtil.isEmpty(mesPlanOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getEndTimeEnd())) {
"endTime", packBean, true); DdlPreparedPack.timeBuilder(
DdlPreparedPack.timeBuilder( mesPlanOrder.getEndTimeStart(),
mesPlanOrder.getCreateDateTimeStart(), mesPlanOrder.getEndTimeEnd(),
mesPlanOrder.getCreateDateTimeEnd(), "endTime", packBean, true);
"createDatetime", packBean, true); }
if (!StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesPlanOrder.getCreateDateTimeStart(),
mesPlanOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
// 排序 // 排序
DdlPreparedPack.getOrderDefault(mesPlanOrder); DdlPreparedPack.getOrderDefault(mesPlanOrder);
@ -180,18 +186,24 @@ public class MesHqlPack {
} }
// 时间段查询 // 时间段查询
DdlPreparedPack.timeBuilder( if (!StringUtil.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getStartTimeEnd())) {
mesWorkOrder.getStartTimeStart(), DdlPreparedPack.timeBuilder(
mesWorkOrder.getStartTimeEnd(), mesWorkOrder.getStartTimeStart(),
"startTime", packBean, true); mesWorkOrder.getStartTimeEnd(),
DdlPreparedPack.timeBuilder( "startTime", packBean, true);
mesWorkOrder.getEndTimeStart(), }
mesWorkOrder.getEndTimeEnd(), if (!StringUtil.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getEndTimeEnd())) {
"endTime", packBean, true); DdlPreparedPack.timeBuilder(
DdlPreparedPack.timeBuilder( mesWorkOrder.getEndTimeStart(),
mesWorkOrder.getCreateDateTimeStart(), mesWorkOrder.getEndTimeEnd(),
mesWorkOrder.getCreateDateTimeEnd(), "endTime", packBean, true);
"createDatetime", packBean, true); }
if (!StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getCreateDateTimeStart(),
mesWorkOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
DdlPreparedPack.getOrderDefault(mesWorkOrder); DdlPreparedPack.getOrderDefault(mesWorkOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
return packBean; return packBean;
@ -1713,14 +1725,18 @@ public class MesHqlPack {
if (mesCustOrder.getStatus() != null) { if (mesCustOrder.getStatus() != null) {
DdlPreparedPack.getNumEqualPack(mesCustOrder.getStatus(), "status", packBean); DdlPreparedPack.getNumEqualPack(mesCustOrder.getStatus(), "status", packBean);
} }
DdlPreparedPack.timeBuilder( if (!StringUtils.isEmpty(mesCustOrder.getOrderTimeStart()) || !StringUtils.isEmpty(mesCustOrder.getOrderTimeEnd())) {
mesCustOrder.getOrderTimeStart(), DdlPreparedPack.timeBuilder(
mesCustOrder.getOrderTimeEnd(), mesCustOrder.getOrderTimeStart(),
"orderDate", packBean, true); mesCustOrder.getOrderTimeEnd(),
DdlPreparedPack.timeBuilder( "orderDate", packBean, true);
mesCustOrder.getCreateDateTimeStart(), }
mesCustOrder.getCreateDateTimeEnd(), if (!StringUtils.isEmpty(mesCustOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesCustOrder.getCreateDateTimeEnd())) {
"createDatetime", packBean, true); DdlPreparedPack.timeBuilder(
mesCustOrder.getCreateDateTimeStart(),
mesCustOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean; return packBean;
} }

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

@ -21,4 +21,7 @@ public class WmsCSOrderMasterModel implements Serializable {
@ApiParam("工厂代码") @ApiParam("工厂代码")
public String organizeCode; public String organizeCode;
@ApiParam("确认框")
public Boolean confirm;
} }

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

@ -99,7 +99,7 @@ public class WmsCSOrderDetails extends BaseBean {
public Integer destSnStatus; public Integer destSnStatus;
/** /**
* 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60-未盘解冻
*/ */
@Column(name = "TRANS_STATUS") @Column(name = "TRANS_STATUS")
@ApiParam(value = "处理状态", example = "1") @ApiParam(value = "处理状态", example = "1")

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

@ -204,7 +204,7 @@ public class WmsPart extends BaseBean {
@ApiParam(value = "循环补货数量", example = "0") @ApiParam(value = "循环补货数量", example = "0")
private Double cycleRquestQty = 0d; private Double cycleRquestQty = 0d;
public int getIqcValue(){ public int getIqcVal(){
return this.iqc == null ? 0 : this.iqc.intValue(); return this.iqc == null ? 0 : this.iqc.intValue();
} }

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

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

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

@ -58,7 +58,7 @@ public class WmsTransType extends BaseBean {
private String transTypeDesc; private String transTypeDesc;
@Column(name = "TM_ID") @Column(name = "TM_ID")
@ApiParam(value = "交易处理组件", example = "-1") @ApiParam(value = "交易处理组件")
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long tmId; private Long tmId;
@ -73,4 +73,8 @@ public class WmsTransType extends BaseBean {
public String getMenuUrl() { public String getMenuUrl() {
return "/handle?transTypeCode=" + this.transTypeCode; return "/handle?transTypeCode=" + this.transTypeCode;
} }
public long getTmIdVal() {
return this.tmId == null ? 0 : this.tmId;
}
} }

Write Preview
Loading…
Cancel
Save