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

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

Browse Source
yun-zuoyi
wynne1005 5 years ago
parent dd1ece9be8 6fa35ad939
commit 3858b2e3d9
8 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File

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

@ -58,19 +58,21 @@ public class MesPcnEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_TYPE {
MONITOR_MODULE(10, "监听组件"),
REVEAL_MODULE(20, "展示组件"),
BUTTON_MODULE(30, "按钮组件"),
TIMING_MODULE(40, "定时组件"),
PCS_BACK_MODULE(50, "工序后台组件"),
PLC_CALLBACK_MODULE(60, "PLC回调工位参数"),
ASSIST_MODULE(70, "辅助组件");
MONITOR_MODULE(10, "MONITOR_MODULE", "监听组件"),
REVEAL_MODULE(20, "REVEAL_MODULE", "展示组件"),
BUTTON_MODULE(30, "BUTTON_MODULE", "按钮组件"),
TIMING_MODULE(40, "TIMING_MODULE", "定时组件"),
PCS_BACK_MODULE(50, "PCS_BACK_MODULE", "工序后台组件"),
PLC_CALLBACK_MODULE(60, "PLC_CALLBACK_MODULE", "PLC回调工位参数"),
ASSIST_MODULE(70, "ASSIST_MODULE", "辅助组件");
private int value;
private String data;
private String description;
WORK_MODULE_TYPE(int value, String description) {
WORK_MODULE_TYPE(int value, String data, String description) {
this.value = value;
this.data = data;
this.description = description;
}
@ -78,6 +80,8 @@ public class MesPcnEnumUtil {
return value;
}
public String getData() { return data; }
public String getDescription() {
return description;
}

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

@ -83,6 +83,11 @@ public class WmsCSRange extends BaseBean {
@AnnoOutputColumn(hidden = true)
public String[] zoneNos;
@Transient
@ApiParam("库存地代码")
@AnnoOutputColumn(hidden = true)
public String areaNo;
public WmsCSRange(){}
public WmsCSRange(String zoneNo,String partNo,String partNameRdd){
@ -91,4 +96,10 @@ public class WmsCSRange extends BaseBean {
this.partNameRdd = partNameRdd;
}
public WmsCSRange(String zoneNo, String areaNo, String partNo, String partNameRdd) {
this.zoneNo = zoneNo;
this.areaNo = areaNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
}
}

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

@ -53,6 +53,9 @@ public class WmsConfig extends BaseBean {
@ApiParam(value ="参数值类型")
private String configValueType;
/**
* SQL Server 2005:请使用 varchar(max)、nvarchar(max) 和 varbinary(max) 数据类型，而不要使用 text、ntext 和 image 数据类型。
*/
@Lob
@Column(name="CONFIG_VALUE", columnDefinition = "TEXT")
@ApiParam(value ="参数值")

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

@ -521,7 +521,7 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
this.orderStatus = orderStatus;
}
public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, Double boxQty) {
public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, Double boxQty,String srcLocateNo) {
this.id = wmsDocMovementDetails.getId();
this.orderNo = wmsDocMovementDetails.getOrderNo();
this.partNo = wmsDocMovementDetails.getPartNo();
@ -533,5 +533,6 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
this.createDatetime = wmsDocMovementDetails.getCreateDatetime();
this.organizeCode = wmsDocMovementDetails.getOrganizeCode();
this.boxQty = boxQty;
this.srcLocateNo = srcLocateNo;
}
}

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

@ -203,6 +203,10 @@ public class WmsPOMaster extends BaseBean {
@ApiParam("周总数")
private Integer weekRcCount;
@Transient
@ApiParam("容差")
private Integer delayHour;
public WmsPOMaster() {
@ -229,7 +233,7 @@ public class WmsPOMaster extends BaseBean {
}
public WmsPOMaster(String orderNo, Integer poStatus, String vendorNo, String vendorName,
String dockCode, String planDate, String planTime) {
String dockCode, String planDate, String planTime, Integer delayHour) {
this.orderNo = orderNo;
this.poStatus = poStatus;
this.vendorNo = vendorNo;
@ -237,6 +241,7 @@ public class WmsPOMaster extends BaseBean {
this.dock = dockCode;
this.planDate = planDate;
this.planTime = planTime;
this.delayHour = delayHour;
}
public int getPoStatusVal() {

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

@ -133,6 +133,10 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam(value = "是否免费", example = "1")
private Integer isFree;
@Column(name = "DELAY_HOUR", columnDefinition = "int default 0")
@ApiParam(value = "容差")
private Integer delayHour;
@Column(name = "REMARK")
@ApiParam("备注")
private String remark;

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

@ -237,6 +237,10 @@ public class WmsStockSn extends BaseBean {
@Transient
public String zoneNameRdd;
@ApiParam(value = "时间")
@Transient
public String date;
@ApiParam(value = "库位名称")
@Transient
public String locateNameRdd;
@ -832,5 +836,19 @@ public class WmsStockSn extends BaseBean {
this.fixLotNo = fixLotNo;
}
public WmsStockSn(String sn, Double qty, String unit, String partNo, String partNameRdd, String partTypeDesc, String lotNo, String leftCode, String fixLotNo, String vendorNo, String organizeCode) {
this.sn = sn;
this.qty = qty;
this.unit = unit;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.partTypeDesc = partTypeDesc;
this.lotNo = lotNo;
this.leftCode = leftCode;
this.fixLotNo = fixLotNo;
this.vendorNo = vendorNo;
this.organizeCode = organizeCode;
}
}

47
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java
Unescape Escape View File

@ -1,47 +0,0 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description : AGV接口Model
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2020-09-10 20:21
* @Modify:
**/
@Data
@Api("AGV接口Model")
public class WmsAgvModel {
@ApiParam(value = "任务ID")
private String taskId;
@ApiParam(value = "源库位")
private String srcLocateNo;
@ApiParam(value = "目标库位")
private String destLocateNo;
@ApiParam(value = "物料编号")
private String partNo;
@ApiParam(value = "物料名称")
private String partName;
@ApiParam(value = "需求数量")
private Double qty;
@ApiParam(value = "工厂代码")
private String organizeCode;
@ApiParam(value = "物料编号集合")
private List<String> partNoList;
@ApiParam(value = "目标库位编号集合")
private List<String> destLocateNoList;
}
Write Preview
Loading…
Cancel
Save