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 eaed7962ab 38f1bd3b01
commit 8a98efa9a6
9 changed files with 117 additions and 119 deletions
Show Stats Download Patch File Download Diff File

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

@ -927,6 +927,9 @@ public class PtlPcnEnumUtil {
}
}
/**
* PTL_区段亮灯任务明细状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum AREA_SECTION_TASK_DETAIL_STATUS {
CREATE(10, "CREATE", "创建"),
@ -956,67 +959,11 @@ public class PtlPcnEnumUtil {
}
/**
* PTL_区段亮灯任务明细状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TASK_DETAIL_STATUS {
CREATE(10, "CREATE", "新建"),
RECEIPT_FINISH(20, "RECEIPT_FINISH", "已完成");
private int value;
private String code;
private String description;
TASK_DETAIL_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
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;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* PTL_区段、区域亮灯任务状态
* PTL_区段亮灯任务状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum AREA_SECTION_TASK_STATUS {
CREATE(10, "CREATE", "新建"),
RECEIPT(20, "RECEIPT", "执行中"),
RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成");
private int value;
@ -1525,64 +1472,10 @@ public class PtlPcnEnumUtil {
return valueOf(val);
}
}
/**
* 区域任务状态(ASN,PO,MOVE,QC)
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MASTER_ORDER_STATUS {
CREATE(10, "CREATE", "创建"),
RECEIPT(20, "IN_PROGRESS", "处理中"),
RECEIPT_FINISH(30, "COMPLETED", "已完成"),
CANCELLED(40, "CANCELLED", "已取消");
private int value;
private String code;
private String description;
MASTER_ORDER_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
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;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 区域任务类型(ASN,PO,MOVE,QC)
* 区段任务类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum AREA_SECTION_TASK_TYPE {
@ -1636,14 +1529,14 @@ public class PtlPcnEnumUtil {
return valueOf(val);
}
}
/**
* 区域任务状态(ASN,PO,MOVE,QC)
* 区域任务状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum AREA_TASK_STATUS {
CREATE(10, "CREATE", "创建"),
RECEIPT(20, "IN_PROGRESS", "处理中"),
RECEIPT_FINISH(30, "COMPLETED", "已完成");
RECEIPT_FINISH(30, "COMPLETED", "完成");
private int value;
private String code;
@ -1693,7 +1586,7 @@ public class PtlPcnEnumUtil {
}
/**
* 区域任务类型(ASN,PO,MOVE,QC)
* 区域任务类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum AREA_TASK_TYPE {

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

@ -5087,4 +5087,67 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* 交易类型-单据回退类型
* 默认为 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_BACK_TYPE {
REC_QTY(10, "REC_QTY", "已收货数量"),
PICK_QTY(20, "PICK_QTY", "已拣货数量"),
MOVE_QTY(30, "MOVE_QTY", "已移库数量"),
OUT_QTY(40, "OUT_QTY", "已出库数量");
private int value;
private String code;
private String description;
ORDER_BACK_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static ORDER_BACK_TYPE codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

4
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
Unescape Escape View File

@ -1551,10 +1551,10 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByHqlWhereByClear(DdlPackBean packBean, String dateTime) {
LOGGER.info("ptl_pcn数据清除查询");
LOGGER.info("PTL-PCN数据清除查询");
StringBuffer queryString = new StringBuffer();
queryString.append("select model from " + persistentClass.getSimpleName()
+ " as model where 1=1 and model.createDatetime <= " + "'" + dateTime + "'" + " ");
+ " as model where 1=1 and model.modifyDatetime < " + "'" + dateTime + "'" + " ");
if (packBean != null) {
queryString.append(packBean.getWhereAppend());

20
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java
Unescape Escape View File

@ -77,6 +77,26 @@ public class PtlPcnSyncCfg extends BaseBean implements Serializable {
@ApiParam(value = "从数据库抽取的条件限制")
private String extractCondition;
@Column(name = "IS_IGNORE_ORG")
@ApiParam(value = "同步的时候是否区分工厂")
private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
@Transient
@ApiParam("同步方式")
private String syncPatternName;
@Transient
@ApiParam("同步类型名称")
private String syncTypeName;
@Transient
@ApiParam(value = "同步的时候是否区分工厂")
private String isIgnoreOrgName;
public int getIsIgnoreOrgVal() {
return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg;
}
public int getSyncFrequencyVal() {
return this.syncFrequency == null ? 0 : this.syncFrequency;
}

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

@ -44,4 +44,7 @@ public class LightOnModel implements Serializable {
@ApiParam("是否熄灯")
private Integer lightFlag;
@ApiParam("状态")
private Integer status;
}

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

@ -160,6 +160,10 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("客户订单号")
public String custOrderNo;
@Column(name = "ASSIGN_DATE_CODE")
@ApiParam(value = "指定生产日期")
private String assignDateCode;
@Transient
@ApiParam("实际批次")
private String actualLot;

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

@ -399,4 +399,12 @@ public class WmsStockSn extends BaseBean {
this.modifyDatetime = modifyDatetime;
this.modifyUser = modifyUser;
}
public WmsStockSn (String partNo, String packageNo,String locateNo, String createDatetime, String modifyDatetime) {
this.partNo = partNo;
this.packageNo =packageNo;
this.locateNo = locateNo;
this.createDatetime=createDatetime;
this.modifyDatetime = modifyDatetime;
}
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -70,6 +72,11 @@ public class WmsTransType extends BaseBean {
@ApiParam(value = "是否发送异常邮件")
private Integer isSendErrorEmail;
@Column(name = "ORDER_BACK_TYPE")
@ApiParam(value = "单据回退类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_BACK_TYPE.class, refForeignKey = "value", value = "description")
private Integer orderBackType;
@Transient
@ApiParam("菜单URL")
private String menuUrl;
@ -78,7 +85,6 @@ public class WmsTransType extends BaseBean {
@ApiParam("交易处理组件调用类")
private String callClass;
public String getMenuUrl() {
return "/handle?transTypeCode=" + this.transTypeCode;
}

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

@ -418,6 +418,7 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringRightLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result);
DdlPreparedPack.getNumEqualPack(wmsTransType.getOrderBackType(),"orderBackType",result);
DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result);
getStringBuilderPack(wmsTransType, result);

Write Preview
Loading…
Cancel
Save