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
zcg 6 years ago
parent dbe2d32bb6 018908d3cb
commit 192034152b
14 changed files with 171 additions and 111 deletions
Show Stats Download Patch File Download Diff File

43
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java
Unescape Escape View File

@ -0,0 +1,43 @@
package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.base.common.Pager;
import io.swagger.annotations.Api;
import lombok.Data;
import java.util.List;
/**
* @Description : 甘特图分页查询参数
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-11-22
* @Modify:
**/
@Data
@Api("甘特图分页查询参数")
public class GanttPager extends Pager {
public static class SortData {
// 排序对象
private String field;
// 排序类型，1为升序，0为降序
private Boolean ascending;
public String getField() {
return field;
}
public void setField(String field) {
this.field = field;
}
public Boolean getAscending() {
return ascending;
}
public void setAscending(Boolean ascending) {
this.ascending = ascending;
}
}
private String filter;
private List<SortData> sorts;
}

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

@ -12,6 +12,41 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* JIS发运模式类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_PATTERN_TYPE {
ONE(10, "一套发运"),
TRUE(20, "多套发运"),
FALSE(30, "单产品多套发运");
private int value;
private String description;
MES_JIS_PATTERN_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
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;
}
}
/**
* 是否解析
@ -2386,82 +2421,6 @@ public class MesEnumUtil {
}
/**
* mes按钮状态配置 判断符号
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_BUTTON_STATUS_JUDGE_FLAG {
EQUAL("=", "等于"),
NOT_EQUAL("!=", "不等于"),
GREATER_THAN(">", "大于"),
NOT_LESS_THAN(">=", "大于大于"),
LESS_THAN("<", "小于"),
NOT_GREATER_THAN("<=", "小于等于");
private String value;
private String description;
MES_BUTTON_STATUS_JUDGE_FLAG(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* mes按钮状态配置 逻辑符号
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_BUTTON_STATUS_LOGIC_FLAG {
AND("&&", "逻辑与"),
OR("||", "逻辑或");
private String value;
private String description;
MES_BUTTON_STATUS_LOGIC_FLAG(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesWorkOrder实体对应的approvalStatus值 审批状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

15
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.annotation;
import java.lang.annotation.*;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/12/25 1:45 下午
* @Description:
**/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
@Documented
public @interface UseMongoDb {
}

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

@ -37,21 +37,9 @@ public class MesButtonStatus extends BaseBean {
@ApiParam("实体类名称")
private String ClassName;
@Column(name = "STATUS_FIELD")
@ApiParam("状态字段")
private String statusField;
@Column(name = "JUDGE_FLAG")
@ApiParam("判断符合")
private String judgeFlag;
@Column(name = "STATUS_VALUE")
@ApiParam("状态值")
private String statusValue;
@Column(name = "LOGIC_FLAG")
@ApiParam("逻辑符合")
private String logicFlag;
@Column(name = "APPEND_HQL")
@ApiParam("拼接HQL")
private String appendHql;
@Column(name = "STATUS_DESC")
@ApiParam("描述")

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

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.mes.annotation.UseMongoDb;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -33,6 +34,7 @@ import javax.persistence.Transient;
@Index(columnList = "OBJECT_CODE"),
@Index(columnList = "MODIFY_DATE_TIME")
})
//@UseMongoDb
@Api("生产数据")
public class MesProductData extends BaseBean {
@Column(name = "WORK_CENTER_CODE")

15
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java
Unescape Escape View File

@ -0,0 +1,15 @@
//package cn.estsh.i3plus.pojo.mes.repositorymongo;
//
//
//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
//import cn.estsh.i3plus.pojo.mes.bean.MesProductData;
//import org.springframework.stereotype.Repository;
//
///**
// * @Author: Wynne.Lu
// * @CreateDate: 2019/12/25 1:30 下午
// * @Description:
// **/
//@Repository
//public interface MesProductDataRepository extends BaseMongoRepository<MesProductData, Long> {
//}

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

@ -2097,4 +2097,6 @@ public class MesHqlPack {
}
return packBean;
}
}

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

@ -181,6 +181,23 @@ public class WmsCSFactTrans extends BaseBean {
this.srcZoneNo = srcZoneNo;
this.srcWhNo = srcWhNo;
}
public WmsCSFactTrans(String orderNo, String whNo, String zoneNo, String locateNo,Double factQty, String partNo, String partNameRdd, String sn, Double qty, String unit, String srcLocateNo, String srcZoneNo, String srcWhNo,String vendorNo) {
this.orderNo = orderNo;
this.whNo = whNo;
this.zoneNo = zoneNo;
this.locateNo = locateNo;
this.factQty = factQty;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.sn = sn;
this.qty = qty;
this.unit = unit;
this.srcLocateNo = srcLocateNo;
this.srcZoneNo = srcZoneNo;
this.srcWhNo = srcWhNo;
this.vendorNo= vendorNo;
}
public WmsCSFactTrans(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) {
this.partNo=partNo;
this.partNameRdd = partNameRdd;

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

@ -208,7 +208,8 @@ public class WmsDocMovementDetails extends BaseBean {
@Transient
@ApiParam("优先级")
private String priority;
private Integer priority;
public String getRecommondLot() {
return recommondLot == null ? "无" : this.recommondLot;
@ -272,8 +273,10 @@ public class WmsDocMovementDetails extends BaseBean {
this.destLocateNo = destLocateNo;
}
public WmsDocMovementDetails (String partNo) {
public WmsDocMovementDetails (String partNo,Integer priority,String orderNo) {
this.partNo = partNo;
this.priority = priority;
this.orderNo = orderNo;
}
public WmsDocMovementDetails (String partNo,String orderNo) {

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

@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import javax.persistence.*;
/**
* @Description : 附件表
@ -58,4 +55,8 @@ public class WmsFile extends BaseBean{
@Column(name = "REF_TYPE")
@ApiParam(value = "关联单据类型")
private String refType;
@Transient
@ApiParam("预览前缀")
public String previewPrefix;
}

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

@ -62,6 +62,10 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
@Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "已处理数量", example = "0")
public Double handledQty;
public Double getTransQty() {
return this.transQty == null ? 0 : this.transQty.doubleValue();
}

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

@ -124,14 +124,18 @@ public class WmsStockQuan extends BaseBean {
private String prodCfgTypeName;
@Transient
@ApiParam(value = "箱数", example = "-1")
@ApiParam(value = "箱数")
private Integer boxQty;
@Transient
@ApiParam(value = "零件数", example = "-1")
@ApiParam(value = "零件数")
private Double partQty;
@Transient
@ApiParam(value = "处理中数量")
private Double transQty;
@Transient
@ApiParam(value = "ERP库存地")
private String areaNo;
@ -211,7 +215,7 @@ public class WmsStockQuan extends BaseBean {
public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName,
Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
Double consignQty, Double lockQty,Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
this.whNo = whNo;
this.zoneNo = zoneNo;
this.partNo = partNo;
@ -281,5 +285,6 @@ public class WmsStockQuan extends BaseBean {
this.consignQty = consignQty;
this.lockQty = lockQty;
this.scrapQty = scrapQty;
this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty;
}
}

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

@ -278,6 +278,10 @@ public class WmsStockSn extends BaseBean {
@ApiParam("是否寄售 1-是 2-否")
private Integer consignation;
@Transient
@ApiParam(value = "是否最早批次")
public String isFifo;
public WmsStockSn() {
}

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

@ -229,13 +229,13 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getContainerNo(), "containerNo", result);
if (wmsPOMaster.getPriorRC()!=null&&wmsPOMaster.getPriorRC()==WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){
if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) {
ArrayList<Integer> numList = new ArrayList<>();
numList.add(0);
numList.add(wmsPOMaster.getPriorRC());
numList.add(null);
DdlPreparedPack.getNotOrIsNull(numList, "priorRC", result);
}else{
} else {
DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result);
}
@ -923,8 +923,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo",result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(),"qualityDate",result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(), "qualityDate", result);
if (wmsStockSn.getSnStatus() == null) {
DdlPreparedPack.getInPackArray(new Integer[]{
WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(),
@ -1613,7 +1613,9 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
DdlPreparedPack.getOrderByPack(
new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE},
new String[]{"sn", "createDatetime"}, result);
return result;
}
@ -2007,8 +2009,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(),"vendorNo", result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringNotNullPack("locateNo", result);
result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''");
@ -2427,7 +2429,7 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLeftLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result);
// DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result);
@ -2618,15 +2620,15 @@ public class WmsHqlPack {
* @param wmsPullTaskMaster
* @return
*/
public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) {
public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster, String statusList) {
DdlPackBean result = new DdlPackBean();
List<String> stringList = null;
List<Integer> integerList = null;
//List<Integer> integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList());
if(StringUtils.isNotBlank(statusList)){
if (StringUtils.isNotBlank(statusList)) {
stringList = Arrays.asList(statusList.split(","));
integerList = new ArrayList<>();
for(String sl : stringList){
for (String sl : stringList) {
integerList.add(Integer.valueOf(sl));
}
}

Write Preview
Loading…
Cancel
Save