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 a2cf356516 3ff25cc91a
commit c118aac425
5 changed files with 101 additions and 16 deletions
Show Stats Download Patch File Download Diff File

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

@ -815,6 +815,8 @@ public class MesEnumUtil {
public enum MES_TYPE_CFG {
DEFECT("DEFECT", "缺陷"),
POLISHING("POLISHING", "抛光"),
DISASSEMBLE("DISASSEMBLE", "拆解"),
DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
REPAIR("REPAIR", "处理措施"),
SCRAP("SCRAP", "报废原因"),

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

@ -445,6 +445,8 @@ public class MesPcnEnumUtil {
public enum MES_TYPE_CFG {
DEFECT("DEFECT", "缺陷"),
POLISHING("POLISHING", "抛光"),
DISASSEMBLE("DISASSEMBLE", "拆解"),
DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
REPAIR("REPAIR", "处理措施"),
SCRAP("SCRAP", "报废原因"),

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

@ -363,14 +363,6 @@ public class MesWorkOrder extends BaseBean implements Serializable {
private Integer isFictive = 2;
@Transient
@ApiParam("圈数")
private Integer rounds;
@Transient
@ApiParam("小车号")
private String smallCarNo;
@Transient
@ApiParam("行颜色")
private String rowColor;
@ -390,6 +382,46 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("生产节拍")
private Integer takt;
/********************** 动态冗余字段（界面维护大写） *********************************/
@Transient
@ApiParam("基准时间")
private String standardDate;
@Transient
@ApiParam("圈数")
private Integer rounds;
@Transient
@ApiParam("节拍")
private Integer chainSpeed;
@Transient
@ApiParam("小车号")
private String smallCarNo;
@Transient
@ApiParam("小车数量")
private Integer smallCarAmount;
@Transient
@ApiParam("标包")
private Integer standardPackage;
@Transient
@ApiParam("包规代码")
private String packageGauge;
@Transient
@ApiParam("反喷标识")
private String reverseSprayMark;
@Transient
@ApiParam("模具编号集合")
private String mouldCodeList;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;

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

@ -109,7 +109,7 @@ public class WmsDocMovementDetails extends BaseBean {
@Transient
@ApiParam(value = "窗口时间")
private Integer windowTime;
private String windowTime;
@Transient
@ApiParam(value = "紧急程度")
@ -318,6 +318,14 @@ public class WmsDocMovementDetails extends BaseBean {
private Double snp;
@Transient
@ApiParam(value = "订单总数量")
private Integer itemCount;
@Transient
@ApiParam(value = "完成订单数量")
private Integer completeCount;
@Transient
@ApiParam(value = "条码总数量", example = "1")
private Double detailsSnCount;
@ -444,27 +452,32 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("窗口领料结束时间")
private String windowPickEndTime;
public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo ,Double qty,Double pickQty,
Double recQty,Double outQty,Integer itemStatus) {
public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo,Integer itemStatus) {
this.custNo = custNo;
this.orderNo = orderNo;
this.planDate = planDate;
this.planTime = planTime;
this.qty = qty;
this.pickQty = pickQty;
this.recQty= recQty;
this.outQty = outQty;
this.itemStatus = itemStatus;
this.projectNo = projectNo;
this.partNo=partNo;
}
public WmsDocMovementDetails (String orderNo,String projectNo,Double qty,Double pickQty) {
this.orderNo = orderNo;
this.qty = qty;
this.pickQty = pickQty;
this.projectNo = projectNo;
}
public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus) {
public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) {
this.createDatetime = createDatetime;
this.srcLocateNo = srcLocateNo;
this.destLocateNo = destLocateNo;
this.createUser = createUser;
this.itemStatus= itemStatus;
this.orderNo = orderNo;
this.partNo=partNo;
}
public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) {

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

@ -359,6 +359,42 @@ public class WmsMoveSn extends BaseBean {
this.modifyUser = modifyUser;
}
public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd,
String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus,
Integer destSnStatus, String lotNo, String dateCode, String leftCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn,
String createUser, String createDatetime, String modifyDatetime, String modifyUser) {
this.organizeCode = organizeCode;
this.orderNo = orderNo;
this.item = item;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.transTypeCode = transTypeCode;
this.transTypeName = transTypeName;
this.itemStatus = itemStatus;
this.unit = unit;
this.srcLocateNo = srcLocateNo;
this.destLocateNo = destLocateNo;
this.srcQty = srcQty;
this.srcQty = srcQty;
this.destQty = destQty;
this.srcQcStatus = srcQcStatus;
this.descQcStatus = descQcStatus;
this.srcSnStatus = srcSnStatus;
this.destSnStatus = destSnStatus;
this.lotNo = lotNo;
this.dateCode = dateCode;
this.leftCode = leftCode;
this.refSrc = refSrc;
this.destZoneNo = destZoneNo;
this.destWhNo = destWhNo;
this.busiTypeCode = busiTypeCode;
this.sn = sn;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyDatetime = modifyDatetime;
this.modifyUser = modifyUser;
}
public WmsMoveSn(Long id,String organizeCode,String vendorNo,String rcPartNo,String outPartNo, Double destQty) {
this.id = id;
this.organizeCode = organizeCode;

Write Preview
Loading…
Cancel
Save