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
许心洁 5 years ago
parent 0d7e64b160 5c28c8344c
commit eb084d3904
20 changed files with 302 additions and 89 deletions
Show Stats Download Patch File Download Diff File

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

@ -4,8 +4,7 @@ import lombok.Data;
@Data
public class GanttLineModel {
private long id;
private long source;
private long target;
private long from;
private long to;
private int type;
}

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

@ -0,0 +1,25 @@
package cn.estsh.i3plus.pojo.aps.model;
import lombok.Data;
/**
* KPI接口数据
*/
@Data
public class KPIModel {
private Integer salesOrderCount;
private Integer productOrderCount;
private Integer schedWorkCount;
private Integer noSchedWorkCount;
private Integer confirmOrderCount;
private String produceTimes;
private String settingTimes;
private Integer overdueSalesCount;
}

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

@ -0,0 +1,23 @@
package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import java.util.Date;
@Data
public class ResourceLodaRequest {
private ApsEnumUtil.RESOURCE_LOAD_SPAN span;
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date begin; // 统计开始时间
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date end; // 统计结束时间
private Long[] resourceIds;
}

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

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

@ -1079,4 +1079,35 @@ public class ApsEnumUtil {
return description;
}
}
/**
* 资源符合时间间隔类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RESOURCE_LOAD_SPAN {
ONE_HOUR("ONE_HOUR", "1小时"),
TWO_HOUR("TWO_HOUR", "2小时"),
SIX_HOUR("SIX_HOUR", "6小时"),
EIGHT_HOUR("EIGHT_HOUR", "8小时"),
TWELVE_HOUR("TWELVE_HOUR", "12小时"),
ONE_DAY("ONE_DAY", "1天"),
ONE_WEEK("ONE_WEEK", "1周"),
ONE_MONTH("ONE_MONTH", "1月");
private String value;
private String description;
RESOURCE_LOAD_SPAN(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
}

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;
}
public static int descriptionOfValue(String desc) {
public synchronized static int descriptionOfValue(String desc) {
int tmp = IMPP.value;
for (int i = 0; i < values().length; i++) {
if (values()[i].name().equals(desc)) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
break;
}
}
return tmp;

21
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;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static ORGANIZATION_INIT_DATA getByValue(String value) {
for (ORGANIZATION_INIT_DATA mesInsertExcel : values()) {
if (mesInsertExcel.getValue().equals(value)) {
return mesInsertExcel;
for (ORGANIZATION_INIT_DATA organizationInitData : values()) {
if (organizationInitData.getValue().equals(value)) {
return organizationInitData;
}
}
return null;
@ -1484,7 +1487,6 @@ public class MesEnumUtil {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_INSERT_EXCEL getByValue(int value) {
for (MES_INSERT_EXCEL mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
@ -1643,7 +1645,6 @@ public class MesEnumUtil {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_STATION_BOM_IS_REPEAT getByValue(int value) {
for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
@ -1842,7 +1843,6 @@ public class MesEnumUtil {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_WORK_CELL_TYPE getByValue(int value) {
for (MES_WORK_CELL_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
@ -1900,7 +1900,6 @@ public class MesEnumUtil {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_ACTION_TYPE getByValue(int value) {
for (MES_ACTION_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
@ -1948,7 +1947,6 @@ public class MesEnumUtil {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_IS_BIND_KEY getByValue(int value) {
for (MES_IS_BIND_KEY mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
@ -1996,7 +1994,6 @@ public class MesEnumUtil {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_REPAIR_STATUS getByValue(int value) {
for (MES_REPAIR_STATUS mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
@ -2047,7 +2044,6 @@ public class MesEnumUtil {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_OPERATE_TYPE getByValue(int value) {
for (MES_OPERATE_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
@ -3568,7 +3564,8 @@ public class MesEnumUtil {
PCN_LOGIN(160, "PCN_LOGIN", ""),
PCN_MENU(170, "PCN_MENU", ""),
PCN_MODULE(180, "PCN_MODULE", ""),
PCN_LOGOUT(190, "PCN_LOGOUT", "");
PCN_LOGOUT(190, "PCN_LOGOUT", ""),
UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL");
private int value;

14
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;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_STATION_BOM_IS_REPEAT getByValue(int value) {
for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
@ -131,7 +130,8 @@ public class MesPcnEnumUtil {
PCN_LOGIN(160, "PCN_LOGIN", ""),
PCN_MENU(170, "PCN_MENU", ""),
PCN_MODULE(180, "PCN_MODULE", ""),
PCN_LOGOUT(190, "PCN_LOGOUT", "");
PCN_LOGOUT(190, "PCN_LOGOUT", ""),
UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL");
private int value;
@ -192,7 +192,6 @@ public class MesPcnEnumUtil {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_ACTION_TYPE getByValue(int value) {
for (MES_ACTION_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
@ -214,6 +213,7 @@ public class MesPcnEnumUtil {
}
}
/**
* MES_TYPE_CFG 类型信息
*/
@ -253,6 +253,7 @@ public class MesPcnEnumUtil {
return tmp;
}
}
/**
* MesProdBindRecord 是否是关键件
*/
@ -278,7 +279,6 @@ public class MesPcnEnumUtil {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_IS_BIND_KEY getByValue(int value) {
for (MES_IS_BIND_KEY mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
@ -402,7 +402,6 @@ public class MesPcnEnumUtil {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_OPERATE_TYPE getByValue(int value) {
for (MES_OPERATE_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
@ -463,7 +462,6 @@ public class MesPcnEnumUtil {
return tmp;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_MATCH_TYPE getByValue(int value) {
for (MES_MATCH_TYPE mesMatchType : values()) {
if (mesMatchType.getValue() == value) {
@ -2097,6 +2095,9 @@ public class MesPcnEnumUtil {
NEVER(-1, "不过期"),
ONE_HOUR(3600, "一小时"),
FIVE_MINS(300, "5分钟"),
HALF_HOUR(1800, "半小时"),
ONE_QUARTER(900, "一刻钟"),
ONE_MIN(60, "一分钟");
private int value;
@ -2433,7 +2434,6 @@ public class MesPcnEnumUtil {
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ONLINE_SEND_TYPE {

76
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)
public enum PRIORITY {
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)
@ -205,7 +238,8 @@ public class WmsEnumUtil {
RECEIPT(20, "RECEIPT", "处理中"),
RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
CLOSED(40, "CLOSED", "已关闭"),
CANCELLED(50, "CANCELLED", "已取消");
CANCELLED(50, "CANCELLED", "已取消"),
FINISH_PRODUCT_SHIPING_PICKED(60, "FINISH_PRODUCT_SHIPING_PICKED", "配料完成");
private int value;
private String code;
@ -990,6 +1024,7 @@ public class WmsEnumUtil {
INSTOCKED(40, "入库"),
PICKED(50, "配料"),
OUT_STOCK(60, "出库"),
SCRAP(70,"报废"),
COMMING(80, "在途");
private int value;
@ -1314,7 +1349,8 @@ public class WmsEnumUtil {
INVENTORY(20, "已盘"),
FROZEN(30, "已冻结"),
THAWING(40, "已解冻"),
RETURN_GOODS(50, "取消冻结");
RETURN_GOODS(50, "取消冻结"),
Unsettled_(60, "取消冻结");
private int value;
private String description;
@ -4707,4 +4743,40 @@ public class WmsEnumUtil {
}
}
/**
* 计划拉动明细表状态创建
* 默认为 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum VENDOR_TYPE {
VENDOR(10, "供应商"), CARRIERS(20, "承运商");
private int value;
private String description;
VENDOR_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;
}
}
}

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("区域")
private String areaCode;
@Column(name = "AREA_NAME")
@ApiParam("区域名称")
private String areaName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CENTER_NAME")
@ApiParam("工作中心名称")
private String workCenterName;
@Column(name = "PCN_VERSION")
@ApiParam("PCN版本")
private String pcnVersion;

19
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 {
}
// 时间段查询
if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getStartTimeStart(),
mesWorkOrder.getStartTimeEnd(),
"startTime", packBean, true);
}
if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getEndTimeStart(),
mesWorkOrder.getEndTimeEnd(),
"endTime", packBean, true);
}
if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getCreateDateTimeStart(),
mesWorkOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
DdlPreparedPack.getOrderDefault(mesWorkOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
return packBean;
@ -290,32 +296,35 @@ public class MesHqlPack {
*/
public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode());
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
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);
}
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getPartNo())) {
if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
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);
}
// 时间段查询
if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeStart(),
mesProduceSn.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesProduceSn.getOutWorkCenterTimeStart(),
mesProduceSn.getOutWorkCenterTimeEnd(),
"outWorkCenterTime", packBean, true);
}
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("区域")
private String areaCode;
@Column(name = "AREA_NAME")
@ApiParam("区域")
private String areaName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CENTER_NAME")
@ApiParam("工作中心")
private String workCenterName;
@Column(name = "PCN_VERSION")
@ApiParam("PCN版本")
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("对象名称")
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) {
this.id = id;
this.organizeCode = organizeCode;

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepositoty.java → modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepository.java
Unescape Escape View File

@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
* @Modify:
**/
@Repository
public interface MesDefectRecordRepositoty extends BaseRepository<MesDefectRecord, Long> {
public interface MesDefectRecordRepository extends BaseRepository<MesDefectRecord, Long> {
}

16
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 {
}
// 时间段查询
if (!StringUtil.isEmpty(mesPlanOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getStartTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesPlanOrder.getStartTimeStart(),
mesPlanOrder.getStartTimeEnd(),
"startTime", packBean, true);
}
if (!StringUtil.isEmpty(mesPlanOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getEndTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesPlanOrder.getEndTimeStart(),
mesPlanOrder.getEndTimeEnd(),
"endTime", packBean, true);
}
if (!StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesPlanOrder.getCreateDateTimeStart(),
mesPlanOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
// 排序
DdlPreparedPack.getOrderDefault(mesPlanOrder);
@ -180,18 +186,24 @@ public class MesHqlPack {
}
// 时间段查询
if (!StringUtil.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getStartTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getStartTimeStart(),
mesWorkOrder.getStartTimeEnd(),
"startTime", packBean, true);
}
if (!StringUtil.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getEndTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getEndTimeStart(),
mesWorkOrder.getEndTimeEnd(),
"endTime", packBean, true);
}
if (!StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getCreateDateTimeStart(),
mesWorkOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
DdlPreparedPack.getOrderDefault(mesWorkOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
return packBean;
@ -1713,14 +1725,18 @@ public class MesHqlPack {
if (mesCustOrder.getStatus() != null) {
DdlPreparedPack.getNumEqualPack(mesCustOrder.getStatus(), "status", packBean);
}
if (!StringUtils.isEmpty(mesCustOrder.getOrderTimeStart()) || !StringUtils.isEmpty(mesCustOrder.getOrderTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesCustOrder.getOrderTimeStart(),
mesCustOrder.getOrderTimeEnd(),
"orderDate", packBean, true);
}
if (!StringUtils.isEmpty(mesCustOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesCustOrder.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesCustOrder.getCreateDateTimeStart(),
mesCustOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
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("工厂代码")
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;
/**
* 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结
* 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60-未盘解冻
*/
@Column(name = "TRANS_STATUS")
@ApiParam(value = "处理状态", example = "1")

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

@ -109,6 +109,10 @@ public class WmsTmsShippingExt extends BaseBean {
@ApiParam("关联单号")
private String refOrderNo;
@Column(name="PATH_URL")
@ApiParam("回执单地址")
private String pathUrl;
@Transient
@ApiParam("打印模板列表")
private List<WmsTmsShipModel> shipModels;

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

@ -58,4 +58,7 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
@ApiParam(value ="车牌号RDD")
private String carNo;
@ApiParam("回执单地址")
private String pathUrl;
}

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

@ -23,4 +23,10 @@ public class WmsTmsShipModel {
private Double recQty;
@ApiParam("单位")
private String unit;
@ApiParam("序号")
private Integer item;
@ApiParam("装车时间")
private String modifyDatetime;
}

Write Preview
Loading…
Cancel
Save