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 
 Conflicts:
	modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
yun-zuoyi
gcj 5 years ago
parent fc9b8629ab 91716272a6
commit 99eaa8b8ca
29 changed files with 81 additions and 33 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-TEST-SNAPSHOT</version>
<version>1.0-DEV-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-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

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

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-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -3565,8 +3565,8 @@ public class MesEnumUtil {
PCN_MENU(170, "PCN_MENU", ""),
PCN_MODULE(180, "PCN_MODULE", ""),
PCN_LOGOUT(190, "PCN_LOGOUT", ""),
UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL");
UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"),
PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", "");
private int value;
private String code;

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

@ -131,8 +131,8 @@ public class MesPcnEnumUtil {
PCN_MENU(170, "PCN_MENU", ""),
PCN_MODULE(180, "PCN_MODULE", ""),
PCN_LOGOUT(190, "PCN_LOGOUT", ""),
UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL");
UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"),
PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", "");
private int value;
private String code;

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

@ -501,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;
@ -1350,7 +1351,7 @@ public class WmsEnumUtil {
FROZEN(30, "已冻结"),
THAWING(40, "已解冻"),
RETURN_GOODS(50, "取消冻结"),
Unsettled_(60, "取消冻结");
UNSETTLED_NCUNFREEZE(60, "未盘解冻");
private int value;
private String description;
@ -2987,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;
@ -3028,8 +3030,8 @@ public class WmsEnumUtil {
public enum WMS_PART_TYPE_STR {
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 String value;
private String description;
@ -3055,6 +3057,16 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}

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-TEST-SNAPSHOT</version>
<version>1.0-DEV-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-TEST-SNAPSHOT</version>
<version>1.0-DEV-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-TEST-SNAPSHOT</version>
<version>1.0-DEV-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-TEST-SNAPSHOT</version>
<version>1.0-DEV-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-TEST-SNAPSHOT</version>
<version>1.0-DEV-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-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

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-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -34,6 +34,9 @@ public class WmsStockFifoModel {
@ApiParam(value = "物料对应的存储区集合")
Map<String,List<String>> partToZonesMap;
@ApiParam(value = "波次配料物料清单")
boolean collectPicking = false;
@ApiParam("默认规则")
private String defaultRule;
}

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-TEST-SNAPSHOT</version>
<version>1.0-DEV-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-TEST-SNAPSHOT</version>
<version>1.0-DEV-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-TEST-SNAPSHOT</version>
<version>1.0-DEV-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-TEST-SNAPSHOT</version>
<version>1.0-DEV-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-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

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=取消冻结 60-未盘解冻
* 处理状态: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;
}

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

@ -272,4 +272,13 @@ public class WmsDocMovementDetails extends BaseBean {
this.destLocateNo = destLocateNo;
}
public WmsDocMovementDetails (String partNo) {
this.partNo = partNo;
}
public WmsDocMovementDetails (String partNo,String orderNo) {
this.partNo = partNo;
this.orderNo = orderNo;
}
}

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 = "库位类型")

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

@ -114,6 +114,10 @@ public class WmsRoutingRule extends BaseBean {
@ApiParam(value = "目的库位")
private String destLocateNo;
@Column(name = "DEST_MOVE_TYPE")
@ApiParam(value = "目的库位")
private String destMoveType;
public WmsRoutingRule(){}
}

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);

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-TEST-SNAPSHOT</version>
<version>1.0-DEV-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-TEST-SNAPSHOT</version> <modules>
<version>1.0-DEV-SNAPSHOT</version> <modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>
<module>modules/i3plus-pojo-model</module>

Write Preview
Loading…
Cancel
Save