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
rock.yu 5 years ago
parent 77d8aa4bdd 2ca398468f
commit 3a5e446e90
13 changed files with 183 additions and 15 deletions
Show Stats Download Patch File Download Diff File

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

@ -74,6 +74,9 @@ public class AndonBoardModel implements Serializable {
@ApiParam("图表类型颜色")
private String color;
@ApiParam("停线时间比率")
private Integer downtimeRate;
public int getTotalTimeVal() {
return totalTime == null ? 0 : totalTime;
}

1
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
Unescape Escape View File

@ -51,6 +51,7 @@ public class AndonHqlPack {
public static DdlPackBean getAndonMessageRecord(AndonMessageRecord andonMessageRecord) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonMessageRecord.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonMessageRecord.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAlarmCode(), "alarmCode", packBean);
DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAndonOrderNo(), "andonOrderNo", packBean);
DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpCode(), "rpCode", packBean);

26
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java
Unescape Escape View File

@ -80,4 +80,30 @@ public class PagerHelper {
Pager newPager = getPager(oldPager.getPageSize(), oldPager.getCurrentPage(), rowCount);
return newPager;
}
public static void refreshPager(Pager pager,int rowCount){
pager.setPageSize(pager.getPageSize() == 0 ? 10 : pager.getPageSize());
pager.setTotalRows(rowCount);
int totalPages = rowCount / pager.getPageSize();
int mod = rowCount % pager.getPageSize();
if (mod > 0) {
totalPages++;
}
pager.setTotalPages(totalPages);
if(pager.getCurrentPage() > totalPages) {
pager.setCurrentPage(totalPages);
}
int startRow = (pager.getCurrentPage() - 1) * pager.getPageSize();
pager.setStartRow(startRow == 0 ? 1 : startRow);
int endRow;
if (startRow + pager.getPageSize() <= rowCount) {
endRow = startRow + pager.getPageSize() - 1;
} else {
endRow = rowCount;
}
pager.setEndRow(endRow);
}
}

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

@ -1961,8 +1961,10 @@ public class CommonEnumUtil {
return null;
}
// cn.estsh.i3plus.mes.pcn.util.BsJdbcTemplateConfigTest
private String getJDBCUrlMySQL(String database,String host,Integer port){
//TODO 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST
// 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST
return "jdbc:mysql://"+host+":"+port+"/"+database+
"?autoReconnect=true" +
"&useSSL=false" +

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

@ -867,7 +867,8 @@ public class WmsEnumUtil {
WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"),
WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"),
OTHER_IN(730, "OTHER_IN", "其它入库"),
OTHER_OUT(740, "OTHER_OUT", "其它出库");
OTHER_OUT(740, "OTHER_OUT", "其它出库"),
COGI_BALANCE(750, "COGI_BALANCE", "COGI调账");
private int value;
private String code;
@ -9364,6 +9365,51 @@ public class WmsEnumUtil {
return valueOf(val);
}
}
/**
* WMS数据库类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WMS_DB_TYPE {
MYSQL(10, "mysql", "mysql"),
SQLSERVER(20, "sqlserver", "sqlserver");
private int value;
private String code;
private String description;
WMS_DB_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 String valueOfDescription(int val) {
return valueOf(val);
}
}
}

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

@ -202,10 +202,11 @@ public class MesQueueOrder extends BaseBean implements Serializable {
this.workType = workType;
this.orderNo = orderNo;
}
public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty,
public MesQueueOrder(Long id, Double seq, String partNo, String partNameRdd,Integer boxQty,
Integer queueType,Integer status,String createUser,
String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo,
String workCenterCode, String workCellCode) {
this.id = id;
this.seq = seq;
this.partNo = partNo;
this.partNameRdd = partNameRdd;

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

@ -84,7 +84,7 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@Column(name = "IS_PULL")
@ApiParam("是否投料")
private Integer isPull = 2;
private Integer isPull = 1;
@Column(name = "WO_TYPE")
@ApiParam("工单类型")

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

@ -48,4 +48,7 @@ public class MgnBoardAssembleCompRateModel {
@ApiParam("最终良品率")
private String finalQualifiedRate;
@ApiParam("不良描述")
private String defectMemo;
}

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

@ -31,10 +31,16 @@ public class MgnBjBoardModel implements Serializable {
private Integer warnQty;
@ApiParam("预警率")
private Integer warnRate;
@ApiParam("目标数量")
private Integer targetQty;
@ApiParam("计划　数量")
private Integer planQty;
@ApiParam("目标合格率")
private Integer targetRate = 0;
@ApiParam("一次合格率")
private Integer onceQualityRate = 0;
@ApiParam("待生产订单数量")
private Integer waitProduceQty = 0;
@ApiParam(value = "显示颜色")
private String color;
@ -42,6 +48,21 @@ public class MgnBjBoardModel implements Serializable {
@ApiParam("x坐标内容")
private String xAxis;
@ApiParam("班次名称")
private String shiftName;
@ApiParam("班次人数")
private Integer shiftNum;
@ApiParam("产品位置代码")
private String produceCategoryCode;
@ApiParam("产品位置名称")
private String produceCtgyName;
@ApiParam("时段")
private String timeInterval;
@ApiParam("x坐标内容")
private List<String> xAxisList;

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java
Unescape Escape View File

@ -5,8 +5,6 @@ import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
/**
* @author Wynne.Lu
@ -57,8 +55,5 @@ public class Part implements Serializable {
@ApiParam("Mes物料号")
private String partNo;
@ApiParam("单元格编号")
private Map<String, String> cellNoMap = new HashMap<>();
}

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

@ -5,6 +5,7 @@ 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 cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.util.StringUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -319,7 +320,7 @@ public class WmsDocMovementDetails extends BaseBean {
@Transient
@ApiParam(value = "订单总数量")
private Integer itemCount;
private Long itemCount;
@Transient
@ApiParam(value = "完成订单数量")
@ -380,6 +381,7 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam(value = "最早需求时间")
private String firstTime;
public String getRecommondLot() {
return recommondLot == null ? "无" : this.recommondLot;
}
@ -412,6 +414,13 @@ public class WmsDocMovementDetails extends BaseBean {
return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue();
}
public String getLine() {
if (StringUtil.isEmpty(this.line)) {
return "";
}
return this.line;
}
@Version
@Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
@ApiParam(value = "乐观锁", example = "1")
@ -470,16 +479,28 @@ public class WmsDocMovementDetails extends BaseBean {
}
public WmsDocMovementDetails (String createDatetime, String srcZoneNo,String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) {
System.out.println("=======参数方法");
public WmsDocMovementDetails (String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String partNo) {
this.createDatetime = createDatetime;
this.srcLocateNo = srcLocateNo;
this.destLocateNo = destLocateNo;
this.createUser = createUser;
this.itemStatus= itemStatus;
this.orderNo = orderNo;
this.srcZoneNo = srcZoneNo;
this.partNo=partNo;
}
public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String planTime, Long itemCount) {
this.createDatetime = createDatetime;
this.srcZoneNo = srcZoneNo;
this.srcLocateNo = srcLocateNo;
this.destLocateNo = destLocateNo;
this.createUser = createUser;
this.itemStatus = itemStatus;
this.orderNo = orderNo;
this.planTime = planTime;
this.itemCount = itemCount;
}
public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) {
@ -620,4 +641,33 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
this.planTime = planTime;
}
public WmsDocMovementDetails (String erpSrcNo,String orderNo,String projectNo,Double qty,Double pickQty,
String planDate,String planTime,String custNo,String partNo,Integer itemStatus ) {
this.orderNo = orderNo;
this.qty = qty;
this.pickQty = pickQty;
this.projectNo = projectNo;
this.erpSrcNo = erpSrcNo;
this.planDate = planDate;
this.planTime = planTime;
this.custNo = custNo;
this.partNo = partNo;
this.itemStatus = itemStatus;
}
public WmsDocMovementDetails (String orderNo,String projectNo,Double qty,Double pickQty,
String planDate,String planTime,String custNo,String partNo,Integer itemStatus ) {
this.orderNo = orderNo;
this.qty = qty;
this.pickQty = pickQty;
this.projectNo = projectNo;
this.planDate = planDate;
this.planTime = planTime;
this.custNo = custNo;
this.partNo = partNo;
this.itemStatus = itemStatus;
}
}

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

@ -228,6 +228,14 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("erp单号")
private String erpSrcNo;
@Transient
@ApiParam("汇总数量")
private Double sumQty;
@Transient
@ApiParam("汇总收货数量")
private Double sumRcQty;
/**
* 状态:1=新建,10=收货中,20=收货完成,
@ -326,15 +334,15 @@ public class WmsPOMasterDetails extends BaseBean {
this.itemStatus = itemStatus;
}
public WmsPOMasterDetails(Integer poStatus,String dock,String orderNo,String vendorNo,String planDate,String planTime,Double qty,Double rcQty) {
public WmsPOMasterDetails(Integer poStatus,String dock,String orderNo,String vendorNo,String planDate,String planTime,Double sumQty,Double sumRcQty) {
this.orderNo = orderNo;
this.planDate=planDate;
this.planTime=planTime;
this.qty = qty;
this.rcQty = rcQty;
this.vendorNo=vendorNo;
this.dock=dock;
this.poStatus=poStatus;
this.sumQty = sumQty;
this.sumRcQty = sumRcQty;
}
}

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

@ -16,6 +16,7 @@ import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.Version;
import java.util.List;
import java.util.Map;
/**
* @Description : 库存信息
@ -169,6 +170,10 @@ public class WmsStockQuan extends BaseBean {
@ApiParam(value = "应有数量")
private Double theoryQty;
@Transient
@ApiParam(value = "差异数量MAP")
private Map<String, Map<String,Double>> differenceQtyMap;
public Integer getIsSnapshot() {
return this.isSnapshot == null ? 0 : this.isSnapshot;
@ -362,4 +367,11 @@ public class WmsStockQuan extends BaseBean {
this.partNameRdd = partNameRdd;
this.qty = qty;
}
public WmsStockQuan(String whNo, String zoneNo, String locateNo, String partNo, String partNameRdd) {
this.whNo = whNo;
this.zoneNo = zoneNo;
this.locateNo = locateNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
}
}

Write Preview
Loading…
Cancel
Save