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 ext-dev

Browse Source
yun-zuoyi
许心洁 5 years ago
parent 88d2eefcc8 3d1d05ef1c
commit 3cf59e9edc
34 changed files with 125 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-andon/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-aps/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-base-mongo/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-base/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -1656,6 +1656,11 @@ public class WmsEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {

2
modules/i3plus-pojo-form/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-hardswitch/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-ics/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-jobflow/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-lac/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-mdm/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-mes-pcn/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-mes/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -59,4 +59,8 @@ public class MesNumberRule extends BaseBean implements Serializable {
@Column(name = "IS_CYCLE")
@ApiParam("最大值后循环")
private Integer isCycle;
@Column(name = "SPILT_RULE")
@ApiParam("拼接规则")
private String spiltRule;
}

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

@ -138,6 +138,14 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam(value = "包装数量")
private Double qty2;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "VERSION_NO")
@ApiParam("版本号")
private String versionNo;
@Transient
@ApiParam("产品类型名称")
private String produceCategoryName;

7
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java
Unescape Escape View File

@ -40,10 +40,7 @@ public class DataReviewModel {
@ApiParam("显示标识")
private String showFlag;
@ApiParam("关键件颜色")
private String keyPartColor;
@ApiParam("生产数据颜色")
private String prodDataColor;
@ApiParam("颜色")
private String color;
}

6
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java
Unescape Escape View File

@ -94,6 +94,12 @@ public class GenSerialNoModel {
@ApiParam("工序代码")
private String processCode;
@ApiParam("项目代码")
private String prodCfgTypeCode;
@ApiParam("版本号")
private String versionNo;
public GenSerialNoModel(String ruleCode) {
this.ruleCode = ruleCode;

50
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageUnPackModel.java
Unescape Escape View File

@ -0,0 +1,50 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description: UNPACK
* @Reference:
* @Author: wangjie
* @CreateDate: 2020-06-28-11:44
* @Modify:
**/
@Data
public class PackageUnPackModel {
@ApiParam("工厂")
private String organizeCode;
@ApiParam("包装条码")
private String packageNo;
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partName;
@ApiParam("批次")
private String lotNo;
@ApiParam("状态")
private Integer status;
@ApiParam("状态名称")
private String statusName;
@ApiParam("更新时间")
private String modifyDatetime;
@ApiParam("包装数量")
private String partSpecQty;
@ApiParam("UNPACK数据")
private List<PackageUnPackModel> unPackList;
}

2
modules/i3plus-pojo-model/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails;
import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn;
import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
import lombok.Data;
import java.io.Serializable;
@ -19,6 +20,7 @@ public class WmsMoveDetailsModel implements Serializable {
private static final long serialVersionUID = -6968143574442339454L;
private WmsMoveDetails details;
private List<WmsMoveSn> moveSnList;
private List<WmsStockSn> wmsStockSnList;
public WmsMoveDetailsModel(WmsMoveDetails details, List<WmsMoveSn> moveSnList) {
this.details = details;

2
modules/i3plus-pojo-platform/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-ptl/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-report/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-softswitch/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-sweb/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-wms/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -41,15 +41,15 @@ public class WmsCSFactTrans extends BaseBean {
public String orderNo;
@Column(name="WH_NO")
@ApiParam("仓库代码")
@ApiParam("仓库编码")
public String whNo;
@Column(name="ZONE_NO")
@ApiParam("存储区编号")
@ApiParam("存储区编码")
public String zoneNo;
@Column(name="LOCATE_NO")
@ApiParam("库位编号")
@ApiParam("库位编码")
public String locateNo;
@Column(name="PART_NO")
@ -73,9 +73,12 @@ public class WmsCSFactTrans extends BaseBean {
@ApiParam("单位")
public String unit;
/**
* 实盘数量
**/
@Column(name="FACT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "实盘数量", example = "0")
@ApiParam(value = "数量", example = "0")
public Double factQty;
/**
@ -83,7 +86,7 @@ public class WmsCSFactTrans extends BaseBean {
*/
@Column(name="ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.CS_ITEM_STATUS.class, refForeignKey = "value", value = "description")
public Integer itemStatus;
@Column(name="REMARK")

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

@ -56,7 +56,7 @@ public class WmsCSOrderDetails extends BaseBean {
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@Column(name = "UNIT")

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

@ -103,6 +103,7 @@ public class WmsCSRange extends BaseBean {
public WmsCSRange(){}
public WmsCSRange(String zoneNo,String partNo,String partNameRdd){
this.zoneNo = zoneNo;
this.partNo = partNo;
@ -120,7 +121,10 @@ public class WmsCSRange extends BaseBean {
public WmsCSRange(String zoneNo, String locateNo) {
this.zoneNo = zoneNo;
this.locateNo = locateNo;
}
public WmsCSRange(String zoneNo) {
this.zoneNo = zoneNo;
}
public WmsCSRange(String orderNo, String partNo, String zoneNo, Integer orderStatus) {

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

@ -269,6 +269,10 @@ public class WmsDocMovementMaster extends BaseBean {
isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_DEPARTMENT_REMARK", listColumnName = "name", explicitColumnName = "dictionaryValue")
private String fourthRemake;
@Column(name = "IS_REMOVE_ORDER")
@ApiParam(value = "是否撤销单据")
private Integer isRemoveOrder = CommonEnumUtil.FALSE;
@Transient
@ApiParam(value = "发运单号")
private String shipOrderNo;

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

@ -61,7 +61,7 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("行号")
private Integer item;
@Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
@Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
private Double qty;
@ -78,14 +78,14 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("订单号")
private String orderNo;
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "条码打印数量", example = "0")
private Double printQty;
//private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; }
@Column(name = "RC_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@Column(name = "RC_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "收货数量", example = "0")
private Double rcQty = 0d;

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

@ -552,7 +552,8 @@ public class WmsStockSn extends BaseBean {
@ApiParam("库位Z")
private Integer z;
public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z) {
public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z,
String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) {
this.sn = sn;
this.vendorNo = vendorNo;
this.snStatus = snStatus;
@ -564,6 +565,11 @@ public class WmsStockSn extends BaseBean {
this.x = x;
this.y = y;
this.z = z;
this.lotNo = lotNo;
this.dateCode = dateCode;
this.leftCode = leftCode;
this.fixLotNo = fixLotNo;
this.qualityDate = qualityDate;
}
public WmsStockSn() {

2
modules/i3plus-pojo-workflow/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
pom.xml
Unescape Escape View File

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0.0.1</version>
<version>1.0-TEST-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>

Write Preview
Loading…
Cancel
Save