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
wei.peng 6 years ago
parent 1049a11576 c500681b5d
commit e4a3b95f16
13 changed files with 197 additions and 178 deletions
Show Stats Download Patch File Download Diff File

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

@ -180,57 +180,6 @@ public class WmsEnumUtil {
}
/**
* 主表信息 单据来源
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_SRC {
MNU(10, "MNU", "手工"),
ERP(20, "ERP", "ERP接口");
private int value;
private String code;
private String description;
ORDER_SRC(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
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;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 主表信息 单据类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -425,69 +374,6 @@ public class WmsEnumUtil {
}
}
/**
* 消息队列，队列名称
* 1: success_queue
* 2: fail_queue
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_NAME {
SUCCESS_QUEUE(1, "wms_success_queue", "成功消息队列"),
PENDING_QUEUE(2, "wms_pending_queue", "待处理消息队列");
private int value;
private String name;
private String description;
QUEUE_NAME(int value, String name, String description) {
this.value = value;
this.name = name;
this.description = description;
}
public int getValue() {
return value;
}
public String getName() {
return name;
}
public String getDescription() {
return description;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].name;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].name.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 产品入库的产品状态
@ -1293,41 +1179,6 @@ public class WmsEnumUtil {
}
}
/**
* 库存移动单明细状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MOVE_DETAIL_STATUS {
CREATE(10, "创建"),
BE_HANDLE(20, "待处理"),
FINISH(30, "已处理");
private int value;
private String description;
MOVE_DETAIL_STATUS(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;
}
}
/**
* 质检业务类型
@ -2253,4 +2104,57 @@ public class WmsEnumUtil {
return description;
}
}
/**
* NC处理 操作类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NC_HANDLE_BUSI_TYPE {
RECEPTION(10, "RECEPTION", "让步接收"),
SCRAP(20, "SCRAP", "报废"),
QUARANTINE(30, "QUARANTINE", "隔离"),
BACK_QUARANTINE(40, "BACK_QUARANTINE", "反隔离");
private int value;
private String code;
private String description;
NC_HANDLE_BUSI_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
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;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

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

@ -1,5 +1,8 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.wms.bean.WmsASNMaster;
import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementMaster;
import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -13,33 +16,28 @@ import lombok.Data;
@Data
public class PrintOrderDataModel {
@ApiParam(value = "工厂代码")
public String organizeCode;
@ApiParam("业务数据类型")
public Integer busiDataType;
@ApiParam(value = "单号")
@ApiParam("单号")
public String orderNo;
@ApiParam(value = "业务类型", example = "-1")
public Integer busiType;
@ApiParam(value = "状态", example = "-1")
public Integer status;
@ApiParam(value = "打印标志", example = "-1")
public Integer printFlag;
@ApiParam(value = "供应商编号")
public String vendorNo;
@ApiParam("工厂代码")
public String organizeCode;
@ApiParam(value = "客户编号")
public String custNo;
@ApiParam(value = "PO主表")
public WmsPOMaster poMaster;
@ApiParam(value = "版本")
public String version;
@ApiParam(value = "ASN主表")
public WmsASNMaster asnMaster;
@ApiParam(value = "ERP单号")
public String erpSrcNo;
@ApiParam(value = "移库单主表")
public WmsDocMovementMaster movementMaster;
@ApiParam(value = "业务数据类型", example = "-1")
public Integer busiDataType;
public int getBusiDataType() {
if (busiDataType != null) {
return busiDataType.intValue();
}
return 0;
}
}

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

@ -75,6 +75,10 @@ public class SysTaskPlan extends BaseBean {
@ApiParam(value ="任务所属模块")
private Integer taskSoftTypeRdd;
@Column(name="TASK_PLAN_PARAM")
@ApiParam(value ="任务计划参数")
private String taskPlanParam;
@Column(name="TASK_CYCLE_START_DATE_TIME_RDD")
@ApiParam(value ="任务开始时间")
private String taskCycleStartDateTimeRdd;

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

@ -66,4 +66,7 @@ public class WmsASNMaster extends BaseBean {
@ApiParam(value = "是否生产任务", example = "1")
public Integer isTask;
@ApiParam("ASN详情列表")
@Transient
public List<WmsASNMasterDetails> asnMasterDetailsList;
}

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

@ -93,4 +93,8 @@ public class WmsCSOrderDetails extends BaseBean {
@Column(name = "TRANS_STATUS")
@ApiParam(value = "处理状态", example = "1")
public Integer transStatus;
public Double getQty() {
return this.qty == null ? 0 : this.qty;
}
}

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

@ -93,5 +93,22 @@ public class WmsLocate extends BaseBean {
@Column(name="PART_QTY")
@ApiParam(value ="零件数", example = "-1")
private Integer partQty;
private Double partQty;
public Integer getMaxPackageQty() {
return this.maxPackageQty == null ? 0 : this.maxPackageQty;
}
public Integer getMaxPartQty() {
return this.maxPartQty == null ? 0 : this.maxPartQty;
}
public Integer getBoxQty() {
return this.boxQty == null ? 0 : this.boxQty;
}
public Double getPartQty() {
return this.partQty == null ? 0 : this.partQty;
}
}

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

@ -51,4 +51,12 @@ public class WmsLocatePart extends BaseBean{
@Column(name = "MIN")
@ApiParam(value = "最小值", example = "0")
private Double min;
@Column(name = "IS_GENERATE_PICKLIST")
@ApiParam(value = "是否生成领料单", example = "2")
private Integer isGeneratePicklist;
public Integer getIsGeneratePicklist() {
return this.isGeneratePicklist == null ? 0 : this.isGeneratePicklist;
}
}

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

@ -12,6 +12,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description : PO订单主表
@ -82,4 +83,8 @@ public class WmsPOMaster extends BaseBean {
@Column(name="IS_PART")
@ApiParam(value = "是否散件", example = "1")
public Integer isPart;
@ApiParam("PO明细列表信息")
@Transient
public List<WmsPOMasterDetails> poDetailList;
}

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

@ -107,6 +107,10 @@ public class WmsPart extends BaseBean {
@ApiParam(value ="批次校验规则")
private String lotCheckRule;
@Column(name="SN_CONTROL")
@ApiParam(value ="是否条码管理",example = "1")
private Integer snControl;
@Column(name="IN_LOCATE_NO")
@ApiParam(value ="默认入库库位")
private String inLocateNo;

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

@ -96,4 +96,36 @@ public class WmsStockQuan extends BaseBean {
@ColumnDefault("0")
@ApiParam(value = "锁定数量", example = "0")
private Double lockQty;
public Double getQty() {
return this.qty == null ? 0 : this.qty;
}
public Double getFailQty() {
return this.failQty == null ? 0 : this.failQty;
}
public Double getHoldQty() {
return this.holdQty == null ? 0 : this.holdQty;
}
public Double getQcQty() {
return this.qcQty == null ? 0 : this.qcQty;
}
public Double getRinQty() {
return this.rinQty == null ? 0 : this.rinQty;
}
public Double getFreezeQty() {
return this.freezeQty == null ? 0 : this.freezeQty;
}
public Double getConsignQty() {
return this.consignQty == null ? 0 : this.consignQty;
}
public Double getLockQty() {
return this.lockQty == null ? 0 : this.lockQty;
}
}

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

@ -149,4 +149,20 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "库位名称")
@Transient
public String locateNameRdd;
@ApiParam(value = "物料类型描述")
@Transient
public String partTypeDesc;
@ApiParam(value = "客户名称")
@Transient
public String custNameRdd;
@ApiParam(value = "供应商名称")
@Transient
public String vendorNameRdd;
@ApiParam(value = "二维码内容")
@Transient
public String barCode;
}

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

@ -120,4 +120,12 @@ public class WmsTaskDetails extends BaseBean {
@Column(name = "DEST_AREA_NO")
@ApiParam("目的库存地代码")
public String destAreaNo;
public Double getQty() {
return this.qty == null ? 0 : this.qty;
}
public Double getTransQty() {
return this.transQty == null ? 0 : this.transQty;
}
}

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

@ -119,7 +119,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result);
HqlPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result);
HqlPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result);
HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result);
HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", result);
@ -139,11 +139,11 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getStringLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result);
HqlPack.getStringLikerPack(wmsPOMaster.getPoType(), "poType", result);
HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result);
HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
HqlPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
getStringBuilderPack(wmsPOMaster, result);
@ -531,7 +531,7 @@ public class WmsHqlPack {
public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsASNMaster.getOrderNo(), "orderNo", result);
HqlPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result);
HqlPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result);
@ -1559,4 +1559,20 @@ public class WmsHqlPack {
return result.toString();
}
/**
* 移库单订单条码表 分页查询
*
* @param details
* @return
*/
public static String packHqlWmsDocMovementDetails(WmsDocMovementDetails details) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(details.getPartNo(), "partNo", result);
getStringBuilderPack(details, result);
return result.toString();
}
}

Write Preview
Loading…
Cancel
Save