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 5 years ago
parent 8a4974f369 f7c98e3982
commit cb68f62e46
28 changed files with 286 additions and 135 deletions
Show Stats Download Patch File Download Diff File

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

@ -121,14 +121,17 @@ public class Material extends BaseAPS {
@Column(name="MIN_STOCK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最小库存数量")
@FieldAnnotation(property = false)
private Double minStockCount;
@Column(name="SAFE_STOCK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="安全库存数量")
@FieldAnnotation(property = false)
private Double safeStockCount;
@Column(name="MAX_STOCK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最大库存数量")
@FieldAnnotation(property = false)
private Double maxStockCount;
@Column(name="ORDER_BATCH_PERIOD")

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

@ -9,7 +9,7 @@ import java.lang.annotation.*;
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})
@Target({ElementType.FIELD, ElementType.TYPE})
public @interface FieldAnnotation {
// Web前端字段数据类型
WmsEnumUtil.FIELD_TYPE webFieldType();
@ -33,4 +33,6 @@ public @interface FieldAnnotation {
int isShow() default 1;
// 是否跳过本字段扫描 0-不跳过，1-跳过
int isSkip() default 0;
// 下拉枚举名称
String enumName() default "";
}

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

@ -3379,7 +3379,7 @@ public class MesEnumUtil {
TASK_COMPLETE("taskComplete", "整个扫描完成"),
STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
RUNNING_INFO("runningInfo", "执行信息"),
RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
STOP_PCS_CTL("stopPcsCtl", "停止监控");
private String value;

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

@ -1536,10 +1536,10 @@ public class MesPcnEnumUtil {
@Deprecated // 不推荐使用 ， 推荐使用 CommonEnumUtil.DATA_SOURCE_TYPE
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_TYPE {
SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null),
SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"),
SOURCE_ORACLE(30, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null),
SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public");
SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null),
SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"),
SOURCE_ORACLE(300, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null),
SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public");
private int value;
private String code;

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

@ -736,6 +736,16 @@ public class WmsEnumUtil {
return tmp;
}
public static String codeOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -4865,4 +4875,49 @@ public class WmsEnumUtil {
}
}
/**
* 流程提交类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GROUP_COMMIT_MODE {
JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"),REF_GROUP(30, 30, "关联分组号提交");
private int value;
private int code;
private String description;
GROUP_COMMIT_MODE(int value, int code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public int getCode() {
return code;
}
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;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
}

12
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -266,6 +266,18 @@ public class DdlPreparedPack {
}
/**
* 封装String对象成equal语句
*
* @param columnName 列名
* @param packBean
*/
public static void getStringLikePack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val);
}
}
/**
* 封装String对象成不等于语句
*
* @param columnName 列名

61
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java
Unescape Escape View File

@ -18,63 +18,8 @@ public class QcCheckStandardModel {
private Long id;
@ApiParam("物料编码")
private String partNo;
@ApiParam("列头")
private String title;
@ApiParam("工作中心代码")
private String workCenterCode;
@ApiParam("工作单元代码")
private String workCellCode;
@ApiParam("检测类型")
private Integer checkType;
@ApiParam("检测项")
private String checkItem;
@ApiParam("检测标准")
private String checkStandard;
@ApiParam("检测指导")
private String checkGuide;
@ApiParam("频率")
private String checkFrequency;
@ApiParam("物料名称")
private String partName;
@ApiParam("检测结果")
private String checkResult;
@ApiParam("检测值")
private String checkValue;
@ApiParam("检测项类型")
private String checkItemType;
@ApiParam("检测项类型名称")
private String checkItemTypeName;
private List<MesQcCheckStandard> childQcList;
public QcCheckStandardModel() {
}
public QcCheckStandardModel(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard
, String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) {
this.id = id;
this.partNo = partNo;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.checkType = checkType;
this.checkItem = checkItem;
this.checkStandard = checkStandard;
this.checkGuide = checkGuide;
this.checkFrequency = checkFrequency;
this.partName = partName;
this.checkItemType = checkItemType;
this.checkItemTypeName = checkItemTypeName;
}
private List<MesQcCheckStandard> resultList;
}

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java
Unescape Escape View File

@ -19,11 +19,11 @@ public class StepResult<T> {
private String msg;
public static StepResult getSuccessComplete() {
return new StepResult(true);
return new StepResult(true,"");
}
public static StepResult getNonComplete() {
return new StepResult(false);
return new StepResult(false,"");
}
public static StepResult getSuccessComplete(String msg) {

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

@ -29,7 +29,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_BIND_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "KP_SN")
@Index(columnList = "KP_SN"),
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "ITEM_PART_NO")
})
@Api("产品绑定记录表")
public class MesProdBindRecord extends BaseBean {
@ -98,6 +100,19 @@ public class MesProdBindRecord extends BaseBean {
@ApiParam(value = "动作类型")
private String actionType;
@ApiParam(value = "是否绑定关键件名称")
private String isBindKeyName;
@ApiParam(value = "动作类型名称")
private String actionTypeName;
@ApiParam("产品条码零件名称")
private String partName;
@ApiParam("原材料零件名称")
private String itemPartName;
public int getIsFeedVal() {
return this.isFeed == null ? 0 : this.isFeed;
}

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

@ -26,7 +26,8 @@ import java.math.BigDecimal;
@Table(name = "MES_PRODUCE_SN", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PRODUCT_SN"),
@Index(columnList = "CREATE_DATE_TIME")
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "PART_NO")
})
@Api("产品条码表")
public class MesProduceSn extends BaseBean {

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

@ -26,6 +26,7 @@ import javax.persistence.*;
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PRODUCT_SN"),
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "PART_NO"),
@Index(columnList = "MODIFY_DATE_TIME")
})
@Api("产品条码履历表")

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

@ -25,7 +25,8 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QC_CHECK_DATA", indexes = {
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "SN")
@Index(columnList = "SN"),
@Index(columnList = "partNo")
})
@Api("质量过程检测数据")
public class MesQcCheckData extends BaseBean {
@ -93,4 +94,24 @@ public class MesQcCheckData extends BaseBean {
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Transient
@ApiParam("物料名称")
private String partName;
@Transient
@ApiParam("班次")
private String shiftCode;
@Transient
@ApiParam("班组")
private String shiftGroupName;
@Transient
@ApiParam("班长")
private String squadLeader;
@Transient
@ApiParam("工作单元名称")
private String workCellName;
}

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

@ -27,7 +27,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_REPAIR_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "CREATE_DATE_TIME")
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "PART_NO")
})
@Api("维修信息记录表")
public class MesRepairRecord extends BaseBean {

80
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -1822,13 +1822,13 @@ public class MesHqlPack {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSn.getProductSn(), "productSn", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
@ -1849,10 +1849,12 @@ public class MesHqlPack {
// mesProduceSn.getOutWorkCenterEndTime(),
// "outWorkCenterTime", packBean, true);
}
DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeStart(),
mesProduceSn.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeStart(),
mesProduceSn.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
@ -1865,11 +1867,11 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdBindRecord, organizeCode);
if (!StringUtils.isEmpty(mesProdBindRecord.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getPartNo(), "partNo", packBean);
if (!StringUtils.isEmpty(mesProdBindRecord.getItemPartNo())) {
DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean);
}
if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean);
DdlPreparedPack.getStringEqualPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesProdBindRecord.getKpSn())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getKpSn(), "kpSn", packBean);
@ -1892,15 +1894,17 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesProdBindRecord.getSupplierCode())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSupplierCode(), "supplierCode", packBean);
}
DdlPreparedPack.timeBuilder(
mesProdBindRecord.getCreateDateTimeStart(),
mesProdBindRecord.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
if(!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesProdBindRecord.getCreateDateTimeStart(),
mesProdBindRecord.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
/**
* 物料追溯
* 包装明细
*
* @param ifPackageDetail
* @param organizeCode
@ -1931,10 +1935,10 @@ public class MesHqlPack {
public static DdlPackBean getMesRepairRecord(MesRepairRecord mesRepairRecord, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesRepairRecord, organizeCode);
if (!StringUtils.isEmpty(mesRepairRecord.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringRightLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesRepairRecord.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean);
DdlPreparedPack.getStringEqualPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesRepairRecord.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCenterCode(), "workCenterCode", packBean);
@ -1951,10 +1955,12 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesRepairRecord.getDcCode())) {
DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDcCode(), "dcCode", packBean);
}
DdlPreparedPack.timeBuilder(
mesRepairRecord.getCreateDateTimeStart(),
mesRepairRecord.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
if (!StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesRepairRecord.getCreateDateTimeStart(),
mesRepairRecord.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
@ -1968,15 +1974,15 @@ public class MesHqlPack {
public static DdlPackBean getMesQcCheckData(MesQcCheckData mesQcCheckData, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesQcCheckData, organizeCode);
if (!StringUtils.isEmpty(mesQcCheckData.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringRightLikerPack(mesQcCheckData.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckData.getOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getOrderNo(), "orderNo", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckData.getSn())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getSn(), "sn", packBean);
DdlPreparedPack.getStringEqualPack(mesQcCheckData.getSn(), "sn", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckData.getCheckType())) {
if (mesQcCheckData.getCheckType() != null) {
DdlPreparedPack.getNumEqualPack(mesQcCheckData.getCheckType(), "checkType", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckData.getWorkCenterCode())) {
@ -1985,10 +1991,12 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesQcCheckData.getWorkCellCode())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getWorkCellCode(), "workCellCode", packBean);
}
DdlPreparedPack.timeBuilder(
mesQcCheckData.getCreateDateTimeStart(),
mesQcCheckData.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
if (!StringUtils.isEmpty(mesQcCheckData.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesQcCheckData.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesQcCheckData.getCreateDateTimeStart(),
mesQcCheckData.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
@ -2005,13 +2013,13 @@ public class MesHqlPack {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkOrderNo(), "workOrderNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSnTravel.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringRightLikerPack(mesProduceSnTravel.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSnTravel.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getSerialNumber(), "serialNumber", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesProduceSnTravel.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getProductSn(), "productSn", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getProductSn(), "productSn", packBean);
}
if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCellCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCellCode(), "workCellCode", packBean);
@ -2028,10 +2036,12 @@ public class MesHqlPack {
if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) {
DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
}
DdlPreparedPack.timeBuilder(
mesProduceSnTravel.getCreateDateTimeStart(),
mesProduceSnTravel.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesProduceSnTravel.getCreateDateTimeStart(),
mesProduceSnTravel.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}

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

@ -69,6 +69,10 @@ public class PrintOrderDataModel implements Serializable {
@Transient
public String vendorEmail;
@ApiParam(value = "集装箱号")
@Transient
public String containerNo;
public int getBusiDataType() {
if (busiDataType != null) {
return busiDataType.intValue();

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

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.base.common.Pager;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -17,4 +18,7 @@ public class WmsSearchGroupModel {
@ApiParam(value = "组列表")
private List<WmsSearchElementModel> searchElementModelList;
@ApiParam(value = "分页组件")
private Pager pager;
}

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

@ -32,8 +32,8 @@ public class WmsTaskInfoModel implements Serializable {
@ApiParam("关联单号")
public String refSrc;
@ApiParam(value = "关联单据业务类型")
private String busiTypeDesc;
@ApiParam(value = "关联单据业务类型代码")
private String busiTypeCode;
@ApiParam(value = "计划日期")
private String zdate;
@ -59,18 +59,21 @@ public class WmsTaskInfoModel implements Serializable {
@ApiParam(value = "创建人")
public String createUser;
@ApiParam(value = "关联单据类型")
public String refType;
public WmsTaskInfoModel() {
}
public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo,
String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo,
String createDatetime, String srcZoneNo, String createUser) {
this.orderNo = orderNo;
this.taskStatus = taskStatus;
this.opTypeName = opTypeName;
this.transTypeCode = transTypeCode;
this.refSrc = refSrc;
this.busiTypeDesc = busiTypeDesc;
this.busiTypeCode = busiTypeCode;
this.zdate = zdate;
this.ztime = ztime;
this.custNo = custNo;

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

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -69,15 +70,14 @@ public class WmsActionGroup extends BaseBean {
@AnnoOutputColumn
private Integer autoInit;
// 1=true, 2 = false
@Column(name = "IS_COMMIT_REF_MOVE", nullable = false)
@ApiParam(value = "是否连带提交创建状态移动单", example = "2")
@AnnoOutputColumn
private Integer isCommitRefMove;
@Column(name = "COMMIT_MODE", nullable = false)
@ApiParam(value = "提交移动单模式")
@AnnoOutputColumn(refClass = WmsEnumUtil.GROUP_COMMIT_MODE.class)
private Integer commitMode;
// 1=true, 2 = false
@Column(name = "IS_AUTO_COMMIT", nullable = false)
@ApiParam(value = "是否自动提交", example = "1")
@ApiParam(value = "是否自动提交")
@AnnoOutputColumn
private Integer isAutoCommit;
@ -102,8 +102,8 @@ public class WmsActionGroup extends BaseBean {
return this.endAmId == null ? 0 : this.endAmId.longValue();
}
public int getIsCommitRefMoveVal() {
return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue();
public int getCommitModeVal() {
return this.commitMode == null ? 0 : this.commitMode.intValue();
}
public int getIsAutoCommitVal() {

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

@ -207,4 +207,13 @@ public class WmsCSOrderDetails extends BaseBean {
this.organizeCode = organizeCode;
this.qty=qty;
}
public WmsCSOrderDetails (String orderNo, String partNo,String partNameRdd, String locateNo, double qty, double factQty){
this.orderNo=orderNo;
this.partNo=partNo;
this.partNameRdd=partNameRdd;
this.qty=qty;
this.factQty=factQty;
this.locateNo=locateNo;
}
}

5
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.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;
@ -52,6 +53,7 @@ public class WmsCSRange extends BaseBean {
@Column(name = "LOCATE_NO")
@ApiParam("库位编号")
@AnnoOutputColumn(hidden = true)
public String locateNo;
@Column(name = "UNIT")
@ -59,7 +61,8 @@ public class WmsCSRange extends BaseBean {
public String unit;
@Transient
@ApiParam("存储区编号")
@ApiParam("存储区编号组")
@AnnoOutputColumn(hidden = true)
public String[] zoneNos;
public WmsCSRange(){}

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

@ -187,4 +187,8 @@ public class WmsDocMovementMaster extends BaseBean {
public int getOrderStatusVal() {
return this.orderStatus == null ? 0 : this.orderStatus;
}
public int getBusiTypeVal() {
return this.busiType == null ? 0 : this.busiType;
}
}

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

@ -125,6 +125,10 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam("关联单号")
public String refSrc;
@Column(name = "GROUP_NO")
@ApiParam("分组号")
public String groupNo;
@ApiParam(value = "待出库数量", example = "0")
@Transient
private Long waitingCounts;

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

@ -44,4 +44,24 @@ public class WmsPackage extends BaseBean {
@Column(name="PACKAGE_QTY")
@ApiParam(value = "包装件数", example = "1")
public Integer packageQty;
@Column(name="PACK_SPEC")
@ApiParam(value = "包装规格")
public String packSpec;
@Column(name="POCKET_NO")
@ApiParam(value = "容器编号")
public String pocketNo;
@Column(name="PRINT_STATUS")
@ApiParam(value = "打印状态", example = "1")
public Integer printStatus;
@Column(name="PACK_LEVEL")
@ApiParam(value = "包装层级", example = "1")
public Integer packLevel;
@Column(name="MEMO")
@ApiParam(value = "备注")
public String memo;
}

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

@ -50,7 +50,7 @@ public class WmsPart extends BaseBean {
@Column(name = "PART_TYPE")
@ApiParam(value = "物料类型")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "WMS_PART_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description")
private String partType;
@ -112,7 +112,7 @@ public class WmsPart extends BaseBean {
@ColumnDefault("2")
@Column(name = "IQC")
@ApiParam(value = "是否免检", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
private Integer iqc;
@Column(name = "MIN", columnDefinition = "decimal(18,8)")
@ -137,7 +137,7 @@ public class WmsPart extends BaseBean {
@Column(name = "SN_CONTROL")
@ApiParam(value = "是否条码管理", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
private Integer snControl;
@Column(name = "VENDOR_NO")
@ -182,7 +182,7 @@ public class WmsPart extends BaseBean {
@Column(name = "IS_REPORT_PARTNO")
@ApiParam("是否报工零件")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
private Integer isReportPartNo;
@Column(name = "REPORT_LOCATE_NO")
@ -207,7 +207,7 @@ public class WmsPart extends BaseBean {
@Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
@ApiParam(value = "是否贵重")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "IS_VALUABLE")
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description")
private Integer isValuable;
@ -224,15 +224,16 @@ public class WmsPart extends BaseBean {
@Column(name="verb_num")
@ApiParam(value = "单次拆包数")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double verbNum;
@Column(name = "IS_PROD_LOT")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
@ApiParam(value = "是否录入生产批次", example = "1")
private Integer isProdLot = 2;
@Column(name = "PULL_WAY")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "PULL_WAY_STATUS")
@ApiParam(value = "拉动方式", example = "0")
private Integer pullWay = 0;

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

@ -132,13 +132,9 @@ public class WmsTaskDetails extends BaseBean {
@ApiParam("目的库存地代码")
public String destAreaNo;
@Column(name = "BUSI_TYPE")
@ApiParam("业务类型")
public Integer busiType;
@Column(name = "BUSI_TYPE_DESC")
@ApiParam("业务类型描述")
public String busiTypeDesc;
@Column(name = "BUSI_TYPE_CODE")
@ApiParam("业务类型代码")
public String busiTypeCode;
@Column(name = "TRANS_TYPE_CODE_RDD")
@ApiParam("交易类型")

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

@ -45,6 +45,10 @@ public class WmsFieldInfo extends BaseBean {
@ApiParam(value = "字段类型")
private String fieldType;
@Column(name = "ENUM_NAME")
@ApiParam(value = "字段枚举名称")
private String enumName;
@Column(name = "ENTITY_NAME")
@ApiParam(value = "实体名称")
private String entityName;

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

@ -21,6 +21,7 @@ import javax.persistence.*;
@Entity
@Table(name="WMS_SEARCHELEMENT", indexes = {
@Index(columnList = "FIELD_NAME"),
@Index(columnList = "FIELD_TYPE"),
@Index(columnList = "SEARCH_NAME"),
@Index(columnList = "USER_CODE")
})
@ -40,6 +41,10 @@ public class WmsSearchElement extends BaseBean {
@ApiParam(value = "标题名称")
private String titleName;
@Column(name = "FIELD_TYPE")
@ApiParam(value = "字段类型")
private String fieldType;
@Column(name = "CONDITION_EXPRE")
@ApiParam(value = "条件表达式:>,<,>=等")
private String conditionExpre;

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

@ -171,11 +171,33 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean);
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean);
DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
getStringBuilderPack(swebProcurementPlanOrder, packBean);
return packBean;
}
/**
* 物理包装封装
*
* @param wmsPackage
* @return
*/
public static DdlPackBean packWmsPackage(WmsPackage wmsPackage) {
DdlPackBean packBean = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getNumEqualPack(wmsPackage.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo(), "packageNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsPackage.getPackSpec(), "packSpec", packBean);
DdlPreparedPack.getStringLikePack(wmsPackage.getPocketNo(), "pocketNo", packBean);
DdlPreparedPack.getNumEqualPack(wmsPackage.getPackLevel(), "packLevel", packBean);
DdlPreparedPack.getNumEqualPack(wmsPackage.getIsValid()==null?CommonEnumUtil.IS_VAILD.VAILD.getValue():wmsPackage.getIsValid(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
getStringBuilderPack(wmsPackage, packBean);
return packBean;
}
/**
* 库存移动单查询封装
*
* @param wmsDocMovementMaster
@ -231,7 +253,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getContainerNo(), "containerNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getContainerNo(), "containerNo", result);
if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) {
ArrayList<Integer> numList = new ArrayList<>();
numList.add(0);
@ -635,6 +657,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getContainerNo(), "containerNo", result);
// 查询计划时间在指定范围的单号，查询这些单号的数据
if (StringUtils.isNotBlank(wmsASNMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsASNMaster.getPlanDateEnd())) {
@ -1064,7 +1087,7 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsPackage.getPackageNo(), "packageNo", result);
DdlPreparedPack.getStringLikerPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
// DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
getStringBuilderPack(wmsPackage, result);
@ -1365,6 +1388,8 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result);
DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
getStringBuilderPack(wmsCSOrderDetails, result);
@ -2434,6 +2459,9 @@ public class WmsHqlPack {
DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result);
DdlPreparedPack.getNumEqualPack(wmsRouting.getForProduct(), "forProduct", result);
DdlPreparedPack.getNumEqualPack(wmsRouting.getForWareHouse(), "forWareHouse", result);
DdlPreparedPack.getNumEqualPack(wmsRouting.getForProductClass(), "forProductClass", result);
// DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result);
getStringBuilderPack(wmsRouting, result);
@ -2739,8 +2767,8 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsSearchElementRecord(WmsSearchElementFunction searchElementFunction) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(searchElementFunction.getFunctionId(), "functionId", result);
DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result);
DdlPreparedPack.getStringEqualPack(searchElementFunction.getUserCode(), "userCode", result);
DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result);
getStringBuilderPack(searchElementFunction, result);
return result;
}

Write Preview
Loading…
Cancel
Save