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 03eeacd273 335ab2ce51
commit 03982ad2e0
14 changed files with 104 additions and 59 deletions
Show Stats Download Patch File Download Diff File

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

@ -53,11 +53,6 @@ public class ProductOrder extends BaseOrder {
@ApiParam(value ="指定工艺路线")
private String specifyRouting;
@Column(name="RESYNCHRONIZE")
@ApiParam(value ="是否同步")
@FieldAnnotation(defaultValue = "true")
private Boolean resynchronize;
@Column(name="RECALC_COUNT")
@ApiParam(value ="是否重新计算数量")
@FieldAnnotation(defaultValue = "true")

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"),

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;

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

@ -495,7 +495,6 @@ public class MesEnumUtil {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static ORGANIZATION_INIT_DATA getByValue(String value) {
for (ORGANIZATION_INIT_DATA organizationInitData : values()) {
if (organizationInitData.getValue().equals(value)) {
@ -1488,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) {
@ -1647,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) {
@ -1846,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) {
@ -1904,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) {
@ -1952,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) {
@ -2000,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) {
@ -2051,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) {

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;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_STATION_BOM_IS_REPEAT getByValue(int value) {
for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
@ -193,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) {
@ -281,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) {
@ -405,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) {
@ -466,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) {

45
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;
@ -467,7 +501,8 @@ public class WmsEnumUtil {
LINE_LOCATE(50, "L", "线边库"),
NC_LOCATE(60, "N", "NC库"),
SPILLAGE_LOCATE(70, "Y", "溢料库"),
TRANSIT_LOCATE(80, "T", "在途库");
TRANSIT_LOCATE(80, "T", "在途库"),
UTENSIL_LOCATE(90, "U", "器具库");
private int value;
private String code;
@ -1315,7 +1350,8 @@ public class WmsEnumUtil {
INVENTORY(20, "已盘"),
FROZEN(30, "已冻结"),
THAWING(40, "已解冻"),
RETURN_GOODS(50, "取消冻结");
RETURN_GOODS(50, "取消冻结"),
UNSETTLED_NCUNFREEZE(60, "未盘解冻");
private int value;
private String description;
@ -2952,7 +2988,8 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WMS_PART_TYPE {
RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器");
RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"),
UTENSIL(50, "器具");
private int value;
private String description;

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

@ -88,22 +88,27 @@ public class WmsCSFactTrans extends BaseBean {
public String remark;
@Transient
@AnnoOutputColumn(hidden = true)
@ApiParam(value = "剩余数量", example = "1")
public Double surplusQty;
@Column
@AnnoOutputColumn(hidden = true)
@ApiParam("源库位编号")
public String srcLocateNo;
@Column
@AnnoOutputColumn(hidden = true)
@ApiParam("源存储区编号")
public String srcZoneNo;
@Column
@AnnoOutputColumn(hidden = true)
@ApiParam("源仓库编号")
public String srcWhNo;
@Column
@AnnoOutputColumn(hidden = true)
@ApiParam("是否范围内")
public Integer isScope;
@ -112,10 +117,12 @@ public class WmsCSFactTrans extends BaseBean {
public String vendorNo;
@Transient
@AnnoOutputColumn(hidden = true)
@ApiParam(value = "实盘箱数", example = "1")
public Long countBoxQty;
@Transient
@AnnoOutputColumn(hidden = true)
@ApiParam(value = "物料数量", example = "1")
public Double sumPartQty;
@ -125,17 +132,25 @@ public class WmsCSFactTrans extends BaseBean {
* 60=在途,70=已隔离,80=破包,90=冻结,100=作废
*/
@Transient
@AnnoOutputColumn(hidden = true)
@ApiParam(value = "条码状态", example = "1")
public Integer snStatus;
@Transient
@AnnoOutputColumn(hidden = true)
@ApiParam(value = "条码状态(冻结时)", example = "1")
public Integer destSnStatus;
@Transient
@AnnoOutputColumn(hidden = true)
@ApiParam("存储区编号组")
public String[] zoneNos;
@Transient
@AnnoOutputColumn(hidden = true)
@ApiParam("行号")
private String item;
public WmsCSFactTrans(){}
public Integer getIsScopeVal() {

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

@ -42,6 +42,7 @@ public class WmsCSOrderDetails extends BaseBean {
@Column(name = "ITEM")
@ApiParam("行号")
@AnnoOutputColumn(hidden = true)
public String item;
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ -99,7 +100,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")
@ -112,26 +113,32 @@ public class WmsCSOrderDetails extends BaseBean {
@Transient
@ApiParam(value = "实盘数量", example = "1")
@AnnoOutputColumn(hidden = true)
public Double factQty;
@Transient
@ApiParam(value = "剩余数量", example = "1")
@AnnoOutputColumn(hidden = true)
public Double surplusQty;
@Transient
@ApiParam("目标库位编号")
@AnnoOutputColumn(hidden = true)
public String destLocateNo;
@Transient
@ApiParam("前端表格编辑使用")
@AnnoOutputColumn(hidden = true)
public Boolean isSet = false;
@Transient
@ApiParam("源单位")
@AnnoOutputColumn(hidden = true)
public String srcUnit;
@Transient
@ApiParam("存储区编号")
@AnnoOutputColumn(hidden = true)
public String[] zoneNos;
/**

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

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -42,6 +43,7 @@ public class WmsCSPart extends BaseBean {
public String partNameRdd;
@Column(name="IS_ADJUST")
@AnnoOutputColumn(hidden = true)
@ApiParam(value = "调整标识", example = "1")
public Integer isAdjust;
}

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

@ -39,7 +39,7 @@ public class WmsLocate extends BaseBean {
private String locateName;
/**
* 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位
* 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位,90=器具库
*/
@Column(name = "LOCATE_TYPE")
@ApiParam(value = "库位类型")

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")
private Double cycleRquestQty = 0d;
public int getIqcValue(){
public int getIqcVal(){
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;
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "可用数量", example = "0")
@Column(name = "QTY", columnDefinition = "decimal(18,8) default 0")
@ApiParam(value = "可用数量")
public Double qty;
@Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
@Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8) default 0")
@ApiParam(value = "不合格数量")
private Double failQty;
@Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "隔离数量", example = "0")
@Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8) default 0")
@ApiParam(value = "隔离数量")
private Double holdQty;
@Column(name = "QC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "质检中数量", example = "0")
@Column(name = "QC_QTY", columnDefinition = "decimal(18,8) default 0")
@ApiParam(value = "质检中数量")
private Double qcQty;
@Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "待入库数量", example = "0")
@Column(name = "RIN_QTY", columnDefinition = "decimal(18,8) default 0")
@ApiParam(value = "待入库数量")
private Double rinQty;
@Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "冻结数量", example = "0")
@Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8) default 0")
@ApiParam(value = "冻结数量")
private Double freezeQty;
@Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "寄售数量", example = "0")
@Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8) default 0")
@ApiParam(value = "寄售数量")
private Double consignQty;
@Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "锁定数量", example = "0")
@Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8) default 0")
@ApiParam(value = "锁定数量")
private Double lockQty;
@Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "报废数量", example = "0")
@Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8) default 0")
@ApiParam(value = "报废数量")
private Double scrapQty;
@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;
@Column(name = "TM_ID")
@ApiParam(value = "交易处理组件", example = "-1")
@ApiParam(value = "交易处理组件")
@JsonSerialize(using = ToStringSerializer.class)
private Long tmId;
@ -73,4 +73,8 @@ public class WmsTransType extends BaseBean {
public String getMenuUrl() {
return "/handle?transTypeCode=" + this.transTypeCode;
}
public long getTmIdVal() {
return this.tmId == null ? 0 : this.tmId;
}
}

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

@ -1359,6 +1359,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result);
DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result);
DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result);

Write Preview
Loading…
Cancel
Save