Merge branch 'test' into dev

yun-zuoyi
钮海涛 5 years ago
commit d74d78353d

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,14 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-base</artifactId>
<packaging>jar</packaging>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<dependencies>
<dependency>

@ -716,7 +716,10 @@ public class MesEnumUtil {
SCRAP("SCRAP", "报废原因"),
QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
WC_CHECK("WC_CHECK", "开线检查项"),
BOARD("BOARD", "看板类型");
BOARD("BOARD", "看板类型"),
EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象");
private String value;
private String description;

@ -3277,7 +3277,7 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SHIPPING_ACTUAL_STATUS {
CREATE(10, "创建"),
CANCEL(20, "已发运");
SHIPPED(20, "已发运");
private int value;
private String description;
@ -3338,7 +3338,7 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FSM_STATE_TYPE {
BEGIN(10, "begin", "开始状态点"),
END(20, "end", "结束状态点");
END(40, "end", "结束状态点");
private int value;
private String code;

@ -715,8 +715,8 @@ public class WmsEnumUtil {
PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动");
EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
LOADING_ORDER(530, "LOADING_ORDER", "装车单");
private int value;
private String code;
private String description;
@ -6610,5 +6610,4 @@ public class WmsEnumUtil {
return valueOf(val);
}
}
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,14 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-mes-pcn</artifactId>
<packaging>jar</packaging>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<dependencies>
<dependency>

@ -93,4 +93,8 @@ public class IfPackageDetail extends BaseBean implements Serializable {
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
@Column(name = "CT_NO")
@ApiParam("容器编号")
private String ctNo;
}

@ -5,14 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-mes</artifactId>
<packaging>jar</packaging>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<dependencies>
<dependency>

@ -93,4 +93,8 @@ public class IfPackageDetail extends BaseBean implements Serializable {
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
@Column(name = "CT_NO")
@ApiParam("容器编号")
private String ctNo;
}

@ -91,6 +91,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
@Transient
private List<MesQcCheckStandard> childQcList;
@Transient
@ApiParam("备注")
private String memo;
public MesQcCheckStandard() {
}

@ -43,6 +43,13 @@ public class ButtonDynamicModel {
this.buttonName = buttonName;
}
public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode){
this.buttonCode = buttonCode;
this.buttonName = buttonName;
this.paramCode = paramCode;
}
public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue){
this.id = id;
this.buttonCode = buttonCode;

@ -97,6 +97,9 @@ public class MesEquipmentModel implements Serializable {
@ApiParam("连接类型")
private String connectTypeName;
@ApiParam("作业校验模式")
private Integer checkModel;
public MesEquipmentModel() {
@ -139,7 +142,7 @@ public class MesEquipmentModel implements Serializable {
}
//获取设备分页数据 queryMesEquipmentByPager
public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
@ -163,6 +166,7 @@ public class MesEquipmentModel implements Serializable {
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.checkModel = checkModel;
}
}

@ -96,6 +96,9 @@ public class MesPlcModel implements Serializable {
@ApiParam("OPCUA路径")
private String opcUrl;
@ApiParam("PLC类型")
private Integer plcType;
public MesPlcModel() {
}
@ -103,7 +106,7 @@ public class MesPlcModel implements Serializable {
public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl) {
String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl, Integer plcType) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
@ -131,5 +134,6 @@ public class MesPlcModel implements Serializable {
this.device = device;
this.objectCode = objectCode;
this.opcUrl = opcUrl;
this.plcType = plcType;
}
}

@ -29,7 +29,7 @@ public class MesWorkOrderModel {
//客户产线代码
@ApiParam("ProductionLineID")
@AnnoOutputColumn
private String custProdLineCode;
private String workCenterCode;
//数量
@ApiParam("DemandQty")

@ -132,9 +132,6 @@ public class StationRequestBean implements Serializable {
@ApiParam("客户工厂代码")
private String customerFactoryCode;
@ApiParam("发运命令")
private String shippingCmd;
@Override
public String toString() {
return "StationRequestBean{" +

@ -2495,6 +2495,30 @@ public class MesHqlPack {
return packBean;
}
/**
*
*
* @param mesProdScatterDetail
* @param organizeCode
* @return
*/
public static DdlPackBean getMesScatterDetail(MesProdScatterDetail mesProdScatterDetail, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdScatterDetail, organizeCode);
if (!StringUtils.isEmpty(mesProdScatterDetail.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesProdScatterDetail.getPartName())) {
DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartName(), "partName", packBean);
}
if (!StringUtils.isEmpty(mesProdScatterDetail.getProduceCtgyCode())) {
DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getProduceCtgyCode(), "produceCtgyCode", packBean);
}
if (!StringUtils.isEmpty(mesProdScatterDetail.getSpCfgCode())) {
DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getSpCfgCode(), "spCfgCode", packBean);
}
return packBean;
}
public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) {
DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean);

@ -5,14 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-model</artifactId>
<packaging>jar</packaging>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<dependencies>
<dependency>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,14 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-softswitch</artifactId>
<packaging>jar</packaging>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<dependencies>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -41,6 +41,10 @@ public class BasVendor extends BaseBean{
@ApiParam("供应商全称")
private String vendorDesc;
@Column(name = "USER_NAME")
@ApiParam("用户名")
private String userName;
@Column(name="VENDOR_ADDR")
@ApiParam("供应商地址")
private String vendorAddr;
@ -57,10 +61,6 @@ public class BasVendor extends BaseBean{
@ApiParam(value = "是否发ASN", example = "0")
private Integer isAsn;
@Column(name = "USER_NAME")
@ApiParam(value = "用户名")
private String userName;
@Column(name = "PASSWORD")
@ApiParam(value = "密码")
private String password;

@ -47,4 +47,14 @@ public class WmsCustWindow extends BaseBean {
@Column(name = "DELAY_HOUR")
@ApiParam(value = "容差")
private Integer delayHour;
public WmsCustWindow(WmsCustWindow custWindow) {
this.custNo = custWindow.getCustNo();
this.custWindowTime = custWindow.getCustWindowTime();
this.weeks = custWindow.getWeeks();
this.delayHour = custWindow.getDelayHour();
}
public WmsCustWindow() {
}
}

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
@ -359,4 +358,10 @@ public class WmsDocMovementDetails extends BaseBean {
this.modifyDatetime = modifyDatetime;
}
public WmsDocMovementDetails(WmsPOMasterDetails poMasterDetails) {
this.orderNo = poMasterDetails.getOrderNo();
this.planDate = poMasterDetails.getPlanDate();
this.planTime = poMasterDetails.getPlanTime();
}
}

@ -217,4 +217,12 @@ public class WmsDocMovementMaster extends BaseBean {
public int getBusiTypeVal() {
return this.busiType == null ? 0 : this.busiType;
}
public WmsDocMovementMaster(WmsPOMaster wmsPoMaster) {
this.orderNo = wmsPoMaster.getOrderNo();
this.vendorNo = wmsPoMaster.getVendorNo();
}
public WmsDocMovementMaster() {
}
}

@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :
@ -67,4 +68,8 @@ public class WmsDocSoDetails extends BaseBean {
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@Transient
@ApiParam(value = "客户编号")
private String custCode;
}

@ -72,6 +72,10 @@ public class WmsDockOrderInfo extends BaseBean {
private String orderNo;
@Transient
@ApiParam("驾驶员编码")
private String driverNo;
@Transient
@ApiParam("库位代码")
private Integer masterStatus;
}

@ -0,0 +1,72 @@
package cn.estsh.i3plus.pojo.wms.dto;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
/**
* @Description :
* @Reference :
* @Author :QianHuaSheng
* @CreateDate : 2020-04-27 4:37
* @Modify:
**/
@Data
@Entity
public class AssignmentDto {
@Id
@GeneratedValue(generator = "IDGenerator")
@GenericGenerator(name = "IDGenerator", strategy = "assigned")
@ApiParam(value = "主键", example = "0")
public Long id;
@ApiParam(value = "单号")
private String orderNo;
@ApiParam(value = "时间")
private String createDatetime;
@ApiParam(value = "零件号")
private String partNo;
@ApiParam(value = "零件号名称")
private String partNameRdd;
@ApiParam(value = "源存储区")
private String srcZoneNo;
@ApiParam(value = "客户编码")
private String custNo;
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
private Integer itemStatus;
@ApiParam(value = "状态中文描述", example = "1")
private String itemStatusStr;
@ApiParam(value = "出库数量")
private Double outQty;
public AssignmentDto(String orderNo, String createDatetime, String partNameRdd,
String srcZoneNo, String custNo, Integer itemStatus, Double outQty, String partNo) {
this.orderNo = orderNo;
this.createDatetime = createDatetime;
this.partNameRdd = partNameRdd;
this.srcZoneNo = srcZoneNo;
this.custNo = custNo;
this.itemStatus = itemStatus;
this.outQty = outQty;
this.partNo = partNo;
}
public AssignmentDto() {
}
}

@ -72,4 +72,7 @@ public class WmsStockSnDto {
this.partSpec = partSpec;
this.zoneNo = zoneNo;
}
public WmsStockSnDto() {
}
}

@ -21,6 +21,9 @@ public class WmsSupplierExtensionDto {
@ApiParam(value = "供应商编号")
private String vendorNo;
@ApiParam(value = "供应商编号")
private String vendorName;
@ApiParam(value = "数量")
private Integer num;
@ -28,8 +31,9 @@ public class WmsSupplierExtensionDto {
}
public WmsSupplierExtensionDto(String vendorNo, Integer num) {
public WmsSupplierExtensionDto(String vendorNo, Integer num, String vendorName) {
this.vendorNo = vendorNo;
this.num = num;
this.vendorName = vendorName;
}
}

@ -1663,7 +1663,8 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>

Loading…
Cancel
Save