I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/test' into dev

Browse Source
yun-zuoyi
钮海涛 4 years ago
parent d089d0fba8 6e5ea4462f
commit 48b4e45850
11 changed files with 132 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -355,7 +355,7 @@ public class MesPcnEnumUtil {
PCN_LOGOUT(190, "PCN_LOGOUT", ""),
UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"),
PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"),
PCN_SYS_ALL_LANGUAGE_URL(220, "PCN_SYS_ALL_LANGUAGE_URL", "PCN_SYS_ALL_LANGUAGE_URL"),
PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"),
SYNC_PHOTO_COLLECT_URL(240, "SYNC_PHOTO_COLLECT_URL", "PCN推送图片采集数据至mes");

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

@ -31,7 +31,7 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "IF_PACKAGE")
@Api("料箱表")
@Api("包装条码接口表")
public class IfPackage extends BaseBean implements Serializable {
private static final long serialVersionUID = 9099416791684702129L;

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

@ -115,6 +115,10 @@ public class MesDefectRecord extends BaseBean implements Serializable {
@ApiParam("维修状态名称")
private String repairStatusName;
@Transient
@ApiParam("产品二维码")
private String productSn;
public int getRepairStatusVal() {
return this.repairStatus == null ? 0 : this.repairStatus;
}

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
@ -20,4 +21,8 @@ public class ProductBiSeriesModel {
private String type;
@ApiParam("显示的数据")
private List<Double> data;
@ApiParam("实际数量集合")
private List<Double> snQtyList = new ArrayList<>();
@ApiParam("计划数量集合")
private List<Double> planQtyList = new ArrayList<>();
}

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

@ -156,10 +156,10 @@ public class MesHqlPack {
public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
}
if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean);
@ -177,10 +177,10 @@ public class MesHqlPack {
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
}
if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean);
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean);
}
if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
}
if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean);
@ -208,7 +208,7 @@ public class MesHqlPack {
mesWorkOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getAreaCode(), "areaCode", packBean);
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getAreaCode(), "areaCode", packBean);
DdlPreparedPack.getOrderDefault(mesWorkOrder);
return packBean;
}
@ -2081,10 +2081,10 @@ public class MesHqlPack {
public static DdlPackBean getMesProduceSn(MesProduceSn mesProduceSn, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceSn, organizeCode);
if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSn.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
DdlPreparedPack.getStringEqualPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
@ -2093,7 +2093,7 @@ public class MesHqlPack {
DdlPreparedPack.getStringEqualPack(mesProduceSn.getProductSn(), "productSn", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
}
if (mesProduceSn.getSnStatus() != null) {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
@ -2102,7 +2102,7 @@ public class MesHqlPack {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSn.getVinCode(), "vinCode", packBean);
}
if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);

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

@ -49,4 +49,19 @@ public class WmsCSOrderDetailsModel implements Serializable {
@ApiParam("目标库位")
public String destLocateNo;
@ApiParam("应盘人")
public String detailsCreateUser;
@ApiParam("应盘时间")
public String detailsCreateDatetime;
@ApiParam("实盘人")
public String factCreateUser;
@ApiParam("实盘时间")
public String factCreateDatetime;
}

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

@ -53,4 +53,15 @@ public class SwebPurchaseChangeLog extends BaseBean {
@Column(name = "REMARK")
@ApiParam("备注")
private String remark;
public SwebPurchaseChangeLog() {
}
public SwebPurchaseChangeLog(Integer itemStatus, String remark, String modifyDatetime, String modifyUser) {
this.itemStatus = itemStatus;
this.remark = remark;
this.modifyDatetime = modifyDatetime;
this.modifyUser = modifyUser;
}
}

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

@ -278,10 +278,11 @@ public class WmsPOMasterDetails extends BaseBean {
this.rcQty = rcQty;
}
public WmsPOMasterDetails(String orderNo ,String erpAreaNo,String organizeCode){
public WmsPOMasterDetails(String orderNo ,String erpAreaNo,String organizeCode, String createDatetime){
this.orderNo = orderNo;
this.erpAreaNo = erpAreaNo;
this.organizeCode = organizeCode;
this.createDatetime = createDatetime;
}
public WmsPOMasterDetails(

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

@ -8,8 +8,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
@ -19,6 +17,8 @@ import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
@ -923,4 +923,14 @@ public class WmsStockSn extends BaseBean {
this.snStatus = snStatus;
this.lotNo = lotNo;
}
public WmsStockSn(String organizeCode, String sn, String partNo, String locateNo, String whNo, String zoneNo, String vendorNo) {
this.organizeCode = organizeCode;
this.sn = sn;
this.partNo = partNo;
this.locateNo = locateNo;
this.whNo = whNo;
this.zoneNo = zoneNo;
this.vendorNo = vendorNo;
}
}

35
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java
Unescape Escape View File

@ -0,0 +1,35 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : 自动生成领料看板model
* @Author : shun.cui
* @CreateDate : 2020/12/17 10:34
* @Modify :
**/
@Data
@Api("自动生成领料看板")
public class AutoPickingModel {
@ApiParam("工厂名")
private String organizeCode;
@ApiParam("计划日期")
private String planDate;
@ApiParam("sap单号")
private String erpSrcNo;
@ApiParam("状态")
private int orderStatus;
@ApiParam("父零件号")
private String partNo;
@ApiParam("简称")
private String partNameRdd;
@ApiParam("完成数量")
private Double printQty;
@ApiParam("总数量")
private Double qty;
@ApiParam("操作时间")
private String modifyDateTime;
@ApiParam("操作人")
private String modifyUser;
}

37
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java
Unescape Escape View File

@ -0,0 +1,37 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : 最低库存/最高库存 预警看板 Model
* @Author : shun.cui
* @CreateDate : 2020/12/17 10:55
* @Modify :
**/
@Data
@Api("最低库存/最高库存预警看板")
public class MinAndMaxStockModel {
@ApiParam("工厂名")
private String organizeCode;
@ApiParam("存储区")
private String zoneNo;
@ApiParam("库位")
private String locateNo;
@ApiParam("零件号")
private String partNo;
@ApiParam("简称")
private String partNameAdd;
@ApiParam("数量")
private Double qty;
@ApiParam("最低库存")
private Double min;
@ApiParam("最高库存")
private Double max;
@ApiParam("件号")
private String partTypeDesc;
@ApiParam("包装规格")
private Double snp;
}
Write Preview
Loading…
Cancel
Save