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 test

Browse Source
yun-zuoyi
陈思洁 5 years ago
parent 6ffec48185 db3e90166e
commit 95c63fb30b
10 changed files with 121 additions and 30 deletions
Show Stats Download Patch File Download Diff File

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

@ -869,7 +869,8 @@ public class WmsEnumUtil {
WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"),
OTHER_IN(730, "OTHER_IN", "其它入库"),
OTHER_OUT(740, "OTHER_OUT", "其它出库"),
COGI_BALANCE(750, "COGI_BALANCE", "COGI调账");
COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"),
SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR
private int value;
private String code;

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

@ -0,0 +1,26 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesShiftRest;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description:
* @Reference:
* @Author: wangjie
* @CreateDate: 2019\10\24 22:04
* @Modify:
**/
@Data
public class MesShiftRestModel extends MesShiftRest {
@ApiParam("开始时间")
private String startDate;
@ApiParam("结束时间")
private String endDate;
@ApiParam("实际时间差(毫秒)")
private Long subTimes;
}

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

@ -38,6 +38,9 @@ public class MgnBoardListModel {
@ApiParam("计划完成率")
private String planCompleteRate;
@ApiParam("当前数据标识")
private boolean currentInfo;
@ApiParam("呼叫异常数量")
private Integer exceptQty;

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

@ -67,6 +67,12 @@ public class MgnBjBoardModel implements Serializable {
@ApiParam("时段")
private String timeInterval;
@ApiParam("温度")
private String temperature;
@ApiParam("湿度")
private String humidity;
@ApiParam("x坐标内容")
private List<String> xAxisList;

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

@ -2491,7 +2491,7 @@ public class MesHqlPack {
DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean);
}
if (!StringUtils.isEmpty(queueJitActual.getRelationVinCode())) {
DdlPreparedPack.getStringLikerPack(queueJitActual.getRelationVinCode(), "replaceVinCode", packBean);
DdlPreparedPack.getStringLikerPack(queueJitActual.getRelationVinCode(), "relationVinCode", packBean);
}
if (queueJitActual.getStatus() != null) {
DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean);

38
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
Unescape Escape View File

@ -59,7 +59,7 @@ public class SwebHqlPack {
}
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getPoStatus(), "poStatus", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(purchaseOrder, result);
}
@ -81,11 +81,10 @@ public class SwebHqlPack {
poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.SURE.getValue());
poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.PRINTED.getValue());
poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.DELIVERY.getValue());
//poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS..getValue());
DdlPreparedPack.getInPackList(poStatus, "poStatus", result);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(purchaseOrder, result);
}
@ -94,7 +93,7 @@ public class SwebHqlPack {
DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result);
DdlPreparedPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result);
DdlPreparedPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(swebPackage, result);
}
@ -102,7 +101,7 @@ public class SwebHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(swebConfig.getConfigCode(), "configCode", result);
DdlPreparedPack.getStringEqualPack(swebConfig.getConfigValue(), "configValue", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(swebConfig, result);
}
@ -121,7 +120,7 @@ public class SwebHqlPack {
HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
HqlPack.getStringEqualPack(model.getOrganizeCode(), "organizeCode", result);
HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return result.toString();
}
@ -134,7 +133,7 @@ public class SwebHqlPack {
// 封装有效状态和删除状态
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(model, result);
}
@ -142,7 +141,7 @@ public class SwebHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(swebProcurementPlanOrder, result);
}
@ -151,7 +150,7 @@ public class SwebHqlPack {
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartName(), "partName", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(swebProcurementPlanOrderDetails, result);
}
@ -159,7 +158,7 @@ public class SwebHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(vendorRel, result);
}
@ -208,22 +207,13 @@ public class SwebHqlPack {
return buildHql(details, result);
}
// public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) {
// DdlPackBean result = new DdlPackBean();
// DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result);
// DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result);
// DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result);
// DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
// return buildHql(master, result);
// }
public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(details, result);
}
@ -242,7 +232,7 @@ public class SwebHqlPack {
if (!StringUtil.isEmpty(capcity.getDateEnd())) {
DdlPreparedPack.getStringSmallerPack(capcity.getDateEnd(), "trackDate", result);
}
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(capcity, result);
}
@ -260,7 +250,7 @@ public class SwebHqlPack {
if (!StringUtil.isEmpty(alarm.getDateEnd())) {
DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result);
}
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(alarm, result);
}
@ -272,7 +262,7 @@ public class SwebHqlPack {
DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
}
DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(stock, result);
}
@ -285,7 +275,7 @@ public class SwebHqlPack {
}
DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(alarm, result);
}
}

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

@ -268,8 +268,8 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
this.z = z;
}
public WmsLocate(Integer boxQty , Double partQty,String locateNo){
this.boxQty=boxQty;
public WmsLocate(Long boxQty , Double partQty,String locateNo){
this.boxQty=boxQty.intValue();
this.partQty=partQty;
this.locateNo=locateNo;
}

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

@ -215,6 +215,23 @@ public class WmsPOMaster extends BaseBean {
@ApiParam(value = "原因", example = "1")
public String reason;
@Column(name = "RECEIVE_DATE")
@ApiParam(value = "收货日期")
public String receiveDate;
@Column(name = "RECEIVE_TIME")
@ApiParam(value = "收货时间")
public String receiveTime;
@Column(name = "WINDOW_START_TIME")
@ApiParam(value = "窗口开始时间")
public String windowStartTime;
@Column(name = "WINDOW_END_TIME")
@ApiParam(value = "窗口结束时间")
public String windowEndTime;
@Transient
@ApiParam("周总数")
private Integer weekRcCount;
@ -227,6 +244,18 @@ public class WmsPOMaster extends BaseBean {
@ApiParam("当前状态")
private String nowStatus;
@ApiParam(value = "延迟次数")
private Long delayCount;
@ApiParam(value = "延迟次数")
private Long sumDelayCount;
@ApiParam("计划交货时间")
private String planPlanDateTime;
public WmsPOMaster() {
@ -264,6 +293,23 @@ public class WmsPOMaster extends BaseBean {
this.delayHour = delayHour;
}
public WmsPOMaster(String vendorNo, Long delayCount) {
this.vendorNo = vendorNo;
this.delayCount = delayCount;
}
public WmsPOMaster(String orderNo, String reason, String planDate, String planTime,
String receiveTime, String vendorNo, String vendorName, String organizeCode) {
this.orderNo = orderNo;
this.reason = reason;
this.planDate = planDate;
this.planTime = planTime;
this.receiveTime = receiveTime;
this.vendorNo = vendorNo;
this.vendorName = vendorName;
this.organizeCode = organizeCode;
}
public int getPoStatusVal() {
return this.poStatus == null ? 0 : this.poStatus;
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -103,6 +105,11 @@ public class WmsPoSn extends BaseBean {
@ApiParam(value = "供应商编码")
public String vendorNo;
// @Column(name = "DATE_CODE", nullable = false)
// @ApiParam(value = "供应商生产批次")
// @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
// public String dateCode = "";
@ApiParam(value = "供应商名称")
@Transient
public String vendorNameRdd;
@ -119,8 +126,9 @@ public class WmsPoSn extends BaseBean {
@Transient
public String lotNo;
@Transient
@ApiParam(value = "生产日期")
@Column(name = "DATE_CODE", nullable = false)
@ApiParam(value = "供应商生产日期")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String dateCode;
@Transient

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

@ -124,6 +124,17 @@ public class WmsInterfaceDataMapper extends BaseBean {
public Integer syncFrequency;
/**
* 同步时间 CRON 表达式
*/
@Column(name = "SYNC_CRON")
public String syncCron;
/**
* 下次同步时间，与 syncCron 属性同时使用
*/
@Column(name = "NEXT_SYNC_TIME")
public String nextSyncTime;
/**
* 上次同步时间
*/
@Column(name = "LAST_SYNC_TIME")

Write Preview
Loading…
Cancel
Save