yun-zuoyi
puxiao.liao 5 years ago
commit aea28cf6bb

@ -707,7 +707,7 @@ public class MesEnumUtil {
EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值");
BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值");
private String value;
private String description;

@ -2024,7 +2024,8 @@ public class MesPcnEnumUtil {
NORMAL(10, "正常"),
CLOSE(20, "关闭"),
FINISH(30, "完成");
FINISH(30, "完成"),
OFF_LINE_REWORK(40, "线下返修");
private int value;
private String description;
@ -4210,4 +4211,50 @@ public class MesPcnEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum KEY_BIND_MODE {
PRODUCE_BOM_BIND(10, "产品BOM绑定"),
SCATTER_BOM_BIND(20, "散件BOM绑定");
private int value;
private String description;
KEY_BIND_MODE(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;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

@ -730,7 +730,10 @@ public class WmsEnumUtil {
SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"),
FORK_INSTORE(550, "FORK_INSTORE", "采购入库"),
CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "料车出库"),
CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "料车入库");
CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "料车入库"),
AGV_PART_NO_OUT(580, "AGV_PART_NO_OUT", "AGV物料出库"),
FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "叉车物料出库"),
FORKLIFT_PART_NO_INSTORE(600, "FORKLIFT_PART_NO_INSTORE", "叉车物料入库");
private int value;
private String code;
private String description;
@ -925,7 +928,8 @@ public class WmsEnumUtil {
VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PICK_RC("KT_PICK_RC", "坤泰拣货"),
UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用"),
TG_PICKING_GOODS("TG_PICKING_GOODS", "TG生产领料");
TG_PICKING_GOODS("TG_PICKING_GOODS", "TG生产领料"),
INTELLIGENT("INTELLIGENT", "智能化");
private String value;
private String description;
@ -3365,6 +3369,7 @@ public class WmsEnumUtil {
public enum SRC_STATUS {
ZMMES("ZMMES", "知明MES"),
TBMES("TBMES", "MES接口"),
TGMES("TGMES", "泰国MES"),
AMP("AMP", "AMP系统"),
DR("DR", "直送拉动");
@ -3383,6 +3388,16 @@ public class WmsEnumUtil {
public String getDescription() {
return description;
}
public static String descriptionOfValue(String value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
public static Map<String, Object> getEnumByName(String enumName) throws Exception {
@ -7555,16 +7570,16 @@ public class WmsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SCAN_CATEGORY {
ASN(10, "wmsDoMovementMasterRepository", "ASN"),
PO(20, "wmsDoMovementMasterRepository", "PO"),
SO(30, "wmsDoMovementMasterRepository", "SO"),
MOVE(40, "wmsDoMovementMasterRepository", "移库单"),
IN_STOCK(50, "wmsDoMovementMasterRepository", "入库单"),
SHIPPING(60, "wmsDoMovementMasterRepository", "发运单"),
QC(70, "wmsDoMovementMasterRepository", "质检单"),
ASN(10, "wmsDocMovementMasterRepository", "ASN"),
PO(20, "wmsDocMovementMasterRepository", "PO"),
SO(30, "wmsDocMovementMasterRepository", "SO"),
MOVE(40, "wmsDocMovementMasterRepository", "移库单"),
IN_STOCK(50, "wmsDocMovementMasterRepository", "入库单"),
SHIPPING(60, "wmsDocMovementMasterRepository", "发运单"),
QC(70, "wmsQCMasterRepository", "质检单"),
CS(80, "wmsCSOrderMasterRepository", "盘点单"),
SN(90, "wmsStockSnRepository", "条码"),
PO_SN(100, "wmsPoSnRepository", "收货条码");
PO_SN(100, "wmsPoSnRepository,wmsASNMasterDetailsRepository", "收货条码");
private int value;
private String code;

@ -46,6 +46,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
private Class<T> persistentClass;
private SnowflakeIdMaker snowflakeIdMaker;
/* 默认查询数据条数 */
private static final Pager DEFAULT_PAGER = new Pager(10,10);
public BaseRepositoryImpl(Class<T> clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) {
super(clz, em);
@ -507,7 +509,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public T getByProperty(DdlPackBean packBean) {
try {
List<T> list = findByHqlWherePage(packBean,Pager.defaultMinPager());
List<T> list = findByHqlWherePage(packBean,DEFAULT_PAGER);
return list != null && list.size() != 0 ? list.get(0) : null;
}catch(NoResultException ne){
LOGGER.error("数据不存在DdlPackBean{}",packBean);
@ -520,17 +522,17 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public T getByProperty(String propertyName, Object value) {
return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, Pager.defaultMinPager());
return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, DEFAULT_PAGER);
}
@Override
public T getByProperty(String[] propertyNames, Object[] values) {
return getByPropertyPager(propertyNames, values, Pager.defaultMinPager());
return getByPropertyPager(propertyNames, values, DEFAULT_PAGER);
}
@Override
public T getByPropertyPager(String[] propertyNames, Object[] values, Pager pager) {
pager = pager == null ? Pager.defaultMinPager(): pager;
pager = pager == null ? DEFAULT_PAGER: pager;
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
@ -601,7 +603,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
try {
if(!StringUtil.isEmpty(vendorNoStr)){
String queryString = "from " + persistentClass.getSimpleName() + " as model where model.vendorNo= :vendorNo";
list=entityManager.createQuery(queryString)
list=entityManager.createQuery(queryString)
.setParameter("vendorNo", vendorNoStr)
.getResultList();
}

@ -0,0 +1,74 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
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 java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-17
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CELL_FEED_RECORD")
@Api("工位投料履历信息")
public class MesCellFeedRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 1947971379489107783L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "RAW_TYPE")
@ApiParam("原料类型")
private String rawType;
@Column(name = "RAW_SN")
@ApiParam("原材料条码")
private String rawSn;
@Column(name = "RAW_QTY")
@ApiParam("原材料数量")
private Double rawQty;
@Column(name = "LOT_NO")
@ApiParam("关联批次")
private String lotNo;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeedRecord;
/**
* @Description :
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-17 09:53
* @Modify:
**/
public interface MesCellFeedRecordRepository extends BaseRepository<MesCellFeedRecord, Long> {
}

@ -40,9 +40,13 @@ public class IfPackageDetail extends BaseBean implements Serializable {
private String partName;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "PACKAGE_NO")
@ApiParam("包装条码")
private String packageNo;
@ -100,11 +104,11 @@ public class IfPackageDetail extends BaseBean implements Serializable {
@ApiParam("容器编号")
private String ctNo;
@Column(name = "SN_TYPE")
@Column(name = "SAMPLE_TYPE")
@ApiParam("条码类型")
private String snType;
private String sampleType;
@Column(name = "SHIPPING_FLAG")
@Column(name = "CUST_DELIVERY_LOCATION")
@ApiParam("客户发往地")
private String shippingFlag;
private String custDeliveryLocation;
}

@ -30,6 +30,11 @@ import java.io.Serializable;
@Api("工位投料信息")
public class MesCellFeed extends BaseBean implements Serializable {
private static final long serialVersionUID = 1947971369479107782L;
@Column(name = "ORDER_NO")
@ApiParam("工单号")
private String orderNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;

@ -0,0 +1,74 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
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 java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-17
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CELL_FEED_RECORD")
@Api("工位投料履历信息")
public class MesCellFeedRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 1947971369489107783L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "RAW_TYPE")
@ApiParam("原料类型")
private String rawType;
@Column(name = "RAW_SN")
@ApiParam("原材料条码")
private String rawSn;
@Column(name = "RAW_QTY")
@ApiParam("原材料数量")
private Double rawQty;
@Column(name = "LOT_NO")
@ApiParam("关联批次")
private String lotNo;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}
}

@ -54,7 +54,7 @@ public class MesCustomer extends BaseBean implements Serializable {
@ApiParam("客户电话")
private String telephone;
@Column(name = "SHIPPING_FLAG")
@Column(name = "CUST_DELIVERY_LOCATION")
@ApiParam("客户发往地")
private String shippingFlag;
private String custDeliveryLocation;
}

@ -44,4 +44,8 @@ public class MesFiCfg extends BaseBean implements Serializable {
@Column(name = "FI_QTY")
@ApiParam("首检数量")
private Double fiQty;
@Column(name = "CHECK_ITEM_TYPE")
@ApiParam("检测项类型")
private String checkItemType;
}

@ -0,0 +1,41 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
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 java.io.Serializable;
/**
* @Description :MES__
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_MOULD_PART")
@Api("MES_模具_零件对照表")
public class MesMouldPart extends BaseBean implements Serializable {
private static final long serialVersionUID = -773118210589936438L;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name = "MOULD_CODE")
@ApiParam("模具代码")
private String mouldCode;
}

@ -43,7 +43,7 @@ public class MesPackSpec extends BaseBean implements Serializable {
@Column(name = "QTY")
@ColumnDefault("0")
@ApiParam(value = "包装数量", example = "0")
private Double qty;
private Double qty = 0d;
@Column(name = "QTY2")
@ColumnDefault("0")

@ -110,13 +110,18 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("容器编号")
private String ctNo;
@Column(name = "SN_TYPE")
@Column(name = "SAMPLE_TYPE")
@ApiParam("条码类型")
private String snType;
private String sampleType = "10";
@Transient
@ApiParam("客户发往地")
private String shippingFlag;
private String custDeliveryLocation;
// 赋值模板代码
@Column(name = "PACKAGE_LABEL_TEMPLATE")
@ApiParam("包装标签模板")
private String packageLabelTemplate;
public MesPackage() {
}

@ -0,0 +1,44 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
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 java.io.Serializable;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/7/30 9:30 AM
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART_SAMPLE")
@Api("产品样本配置")
public class MesPartSample extends BaseBean implements Serializable {
private static final long serialVersionUID = -9190123981329081945L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
}

@ -0,0 +1,50 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
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.Transient;
import java.io.Serializable;
/**
* @Description :MES_
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLAN_TAKT")
@Api("MES_生产节拍")
public class MesPartTakt extends BaseBean implements Serializable {
private static final long serialVersionUID = -7731182105899332278L;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("零件名称")
private String partName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "PLAN_TAKT")
@ApiParam("节拍")
private Integer planTakt;
}

@ -100,21 +100,30 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
@ApiParam(value = "动作类型")
private Integer actionType;
@Transient
@ApiParam(value = "是否绑定关键件名称")
private String isBindKeyName;
@Transient
@ApiParam(value = "动作类型名称")
private String actionTypeName;
@Transient
@ApiParam("产品条码零件名称")
private String partName;
@Column(name = "ITEM_PART_NAME")
@ApiParam("原材料零件名称")
private String itemPartName;
@Transient
@ApiParam("生产队列号")
private String orderNo;
@Transient
@ApiParam("产品条码")
private String productSn;
public int getIsFeedVal() {
return this.isFeed == null ? 0 : this.isFeed;

@ -140,6 +140,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("产品标签模板")
private String prodLabelTemplate;
@Column(name = "CUST_LABEL_TEMPLATE")
@ApiParam("客户标签模板")
private String custLabelTemplate;
// @Version
// @Column(name = "LOCK_VERSION")
// @ApiParam(value = "乐观锁", example = "1")

@ -104,6 +104,10 @@ public class MesQcOrder extends BaseBean implements Serializable {
@ApiParam("客户发运地")
private String custDelieryLocation;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@ApiParam(value = "检测结果")
@Transient
private String reulstStatus;
@ -112,10 +116,6 @@ public class MesQcOrder extends BaseBean implements Serializable {
@Transient
private String serialNumber;
@ApiParam(value = "产线")
@Transient
private String workCenterCode;
@ApiParam(value = "工单号")
@Transient
private String mesWorkNo;

@ -65,11 +65,11 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
private String workType;
@Column(name = "PRODUCE_CATEGORY_CODE")
@ApiParam("产品类型代码")
@ApiParam("产品位置")
private String produceCategoryCode;
@Column(name = "PRODUCE_CATEGORY_NAME_RDD")
@ApiParam("产品类型名称")
@ApiParam("产品位置名称")
private String produceCategoryNameRdd;
@Column(name = "PPT_CODE")
@ -104,6 +104,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
@ApiParam("组件编号")
private String assyNo;
@Column(name = "FORMULA_CONTENT")
@ApiParam("配方内容")
private String formulaContent;
@Transient
@ApiParam("队列序号")
private Double queueSeq;

@ -24,7 +24,7 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SUB_PART")
@Api("数据同步死信")
@Api("替代料")
public class MesSubPart extends BaseBean implements Serializable {
private static final long serialVersionUID = 4636507477301700549L;

@ -79,6 +79,14 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable {
@ApiParam("显示颜色")
private String color;
@Column(name = "VIN_CODE")
@ApiParam("Vin")
private String vinCode;
@Column(name = "PRODUCE_CATEGORY_CODE")
@ApiParam("产品位置代码")
private String produceCategoryCode;
public double getQueueSeqVal() {
return this.queueSeq == null ? 0 : this.queueSeq;
}

@ -2,12 +2,14 @@ package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.util.StringUtils;
import javax.persistence.*;
import java.io.Serializable;
@ -175,6 +177,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("预留字段4")
private String reserved4;
@Column(name = "PARENT_PART_NO")
@ApiParam("父阶物料号")
private String parentPartNo;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
@ -270,7 +276,6 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam(value = "扩展数据MAP")
public Map<String, Object> extendMap;
@Transient
@ApiParam("工单源序号")
private Double srcSeq;
@ -314,4 +319,16 @@ public class MesWorkOrder extends BaseBean implements Serializable {
public int getApprovalStatusVal() {
return this.approvalStatus == null ? 0 : this.approvalStatus;
}
public Map<String, Object> getExtendMap() {
try {
if (!StringUtils.isEmpty(this.extend)) {
return JSONObject.parseObject(this.extend, Map.class);
} else {
return null;
}
} catch (Exception e) {
return null;
}
}
}

@ -37,20 +37,27 @@ public class ButtonDynamicModel {
private String paramValue;
public ButtonDynamicModel(Long id, String buttonCode, String buttonName){
public ButtonDynamicModel(Long id, String buttonCode, String buttonName) {
this.id = id;
this.buttonCode = buttonCode;
this.buttonName = buttonName;
}
public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode){
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){
public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode, String paramValue) {
this.buttonCode = buttonCode;
this.buttonName = buttonName;
this.paramCode = paramCode;
this.paramValue = paramValue;
}
public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue) {
this.id = id;
this.buttonCode = buttonCode;
this.windowNo = windowNo;

@ -30,4 +30,6 @@ public class CellFeedModel {
private String scanQty;
private String LineRemainQty;
}

@ -0,0 +1,45 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: siliter.yuan
* @CreateDate: 2020\06\22 15:58
* @Modify:
**/
@Data
public class MesPaintSnPrintModel implements Serializable {
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("产品条码")
private String produceSn;
@ApiParam("包装编号")
private String packageNo;
@ApiParam("工单号")
private String workOrderNo;
@ApiParam("工作中心代码")
private String workCenterCode;
@ApiParam("工作单元代码")
private String workCellCode;
@ApiParam("物料号")
private String partNo;
@ApiParam("工厂代码")
private String organizeCode;
@ApiParam("打印模板")
private MesLabelTemplate labelTemplate;
}

@ -40,6 +40,9 @@ public class MesStationBomModel {
@ApiParam("报废数")
private Integer scrapQty;
@ApiParam(value = "是否可重复")
private Integer isRepeat;
public MesStationBomModel() {
}
@ -72,4 +75,19 @@ public class MesStationBomModel {
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
}
public MesStationBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName, Integer isRepeat) {
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
this.qty = qty;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.organizeCode = organizeCode;
this.isFeed = isFeed;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
this.isRepeat = isRepeat;
}
}

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Map;
/**
* @author Wynne.Lu
* @date 2020/6/16 14:21
* @desc
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("打包样本")
public class PackageSampleModel {
@ApiParam(name = "已打包数量")
private Double alreadyPackageCount;
@ApiParam(name = "标准打包数量")
private Double standardPackageCount;
@ApiParam(name = "样本类型")
private Map<String, String> sampleTypeMap;
@ApiParam(name = "样本类型代码")
private String lastSampleTypeCode;
@ApiParam(name = "选择的样本类型")
private String chooseSampleTypeCode;
@ApiParam(name = "强制执行工步")
private String forceStepCode;
@ApiParam(name = "强制打包密码")
private String password;
@ApiParam(name = "工厂")
private String organizeCode;
@ApiParam(name = "工单号")
private String workOrderNo;
}

@ -0,0 +1,30 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@Data
public class PackageSnLabelTemplateDataModel {
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partName;
// 工单表.包装规格描述
@ApiParam("包装规格")
private Double packSpecQty;
@ApiParam("生产日期")
private String prodDate;
@ApiParam("工单班次")
private String workOrderShift;
@ApiParam("操作人员名称")
private String operatorName;
@ApiParam("工厂名称")
private String organizeName;
}

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Author: siliter.yuan
* @CreateDate: 2020/6/21 8:06 PM
* @Description:
**/
@Data
@Api("涂装上线MODEL")
public class PaintOnLineModel {
@ApiParam("工作中心")
private String workCenterCode;
@ApiParam("工作单元")
private String workCellCode;
@ApiParam("工单号")
private String workOrderNo;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("颜色")
private String color;
@ApiParam("工单数量")
private Double orderNum;
@ApiParam("包装数量")
private Double packageNum;
@ApiParam("项目名称")
private String productName;
@ApiParam("创建时间")
private String createDateTime;
@ApiParam("圈数")
private Integer rounds;
}

@ -0,0 +1,64 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @Description : -model
* @Reference :
* @Author : adair.song
* @CreateDate : 2020-06-21 11:02
* @Modify:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("涂装工单条码展示组件model")
public class PaintWorkOrderSnModel extends BaseBean {
@ApiParam("工单号")
private String orderNo;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("颜色代码")
private String colorCode;
@ApiParam("颜色名称")
private String colorName;
@ApiParam("工单数量")
private Double workOrderQty;
@ApiParam("包装数量")
private Double packageQty;
@ApiParam("项目名称")
private String prodCfgTypeName;
@ApiParam("圈数")
private Integer groupNum;
@ApiParam("工单状态")
private Integer workOrderStatus;
// 父阶物料号 -- 涂装客户标签打印
@ApiParam("父阶物料号")
private String parentPartNo;
// 父阶物料名称 -- 涂装二次条码打印
@ApiParam("父阶物料名称")
private String parentPartName;
private List<ProdPackModel> prodPackageList;
}

@ -0,0 +1,60 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : -()model
* @Reference :
* @Author : adair.song
* @CreateDate : 2020-06-21 11:02
* @Modify:
**/
@Data
@Api("产品包装model")
public class ProdPackModel {
// 产品条码表--产品条码
@ApiParam("产品条码")
private String productSn;
// 包装主表--包装编号
@ApiParam("一检箱条码")
private String packageNo;
// 包装明细表--创建时间
@ApiParam("一检校验时间")
private String createDatetime;
// 包装主表--打印状态(10未打印 20已打印)
@ApiParam("箱条码状态")
private Integer printStatus;
// 涂装客户标签打印
@ApiParam("客户标签")
private String custSn;
// 涂装客户标签打印
@ApiParam("当前工序")
private String processCode;
// 涂装客户标签打印
@ApiParam("更新时间")
private String modifyDateTime;
public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) {
this.productSn = productSn;
this.packageNo = packageNo;
this.createDatetime = createDatetime;
this.printStatus = printStatus;
}
public ProdPackModel(String productSn, String packageNo, String custSn, String processCode, String modifyDateTime) {
this.productSn = productSn;
this.packageNo = packageNo;
this.custSn = custSn;
this.processCode = processCode;
this.modifyDateTime = modifyDateTime;
}
}

@ -81,12 +81,16 @@ public class QueueOrderModel implements Serializable {
@ApiParam("JIT队列批次")
private String jitLotNo;
@ApiParam("vin")
private String vinCode;
@ApiParam("客户JIT队列编号")
private String jitActualNo;
@ApiParam("产品位置")
private String produceCategoryCode;
public QueueOrderModel() {
}
@ -231,9 +235,9 @@ public class QueueOrderModel implements Serializable {
this.serialNumber=serialNumber;
}
//料架分组队列展示组件
//料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo
public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) {
Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode) {
this.queueGroupNo = queueGroupNo;
this.groupNo = groupNo;
this.orderNo = orderNo;
@ -242,13 +246,16 @@ public class QueueOrderModel implements Serializable {
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.organizeCode = organizeCode;
this.vinCode = vinCode;
this.produceCategoryCode = produceCategoryCode;
}
public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode) {
public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode) {
this.id = id;
this.queueGroupNo = queueGroupNo;
this.jitLotNo = jitLotNo;
this.vinCode = vinCode;
this.organizeCode = organizeCode;
this.produceCategoryCode = produceCategoryCode;
}
}

@ -150,6 +150,9 @@ public class StationRequestBean implements Serializable {
@ApiParam("特殊展示数据")
private Map<String, Object> specialDisplayMap = new HashMap<>();
@ApiParam("物料名称")
private String partName;
@Override
public String toString() {
return "StationRequestBean{" +

@ -0,0 +1,65 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description :
* @Reference :
* @author: jessica.chen
* @date: 2020/6/12 17:10
* @Modify:
*/
@Data
@Api(value="总装生产工单导入模板",description = "总装生产工单导入模板")
public class ZzMesWorkOrderModel extends BaseBean {
private static final long serialVersionUID = 5790342327875846646L;
@ApiParam(value = "日期")
@AnnoOutputColumn
private String workDate;
@ApiParam(value = "班次")
@AnnoOutputColumn
private String shiftName;
@ApiParam(value = "项目名称")
@AnnoOutputColumn(required = false)
private String prodCfgTypeName;
@ApiParam(value = "SAP物料号")
@AnnoOutputColumn
private String partNo;
@ApiParam(value = "产品名称")
@AnnoOutputColumn(required = false)
private String partName;
@ApiParam(value = "产线代码")
private String workCenterCode;
@ApiParam(value = "计划数")
@AnnoOutputColumn
private String qty;
@ApiParam(value = "标包")
@AnnoOutputColumn(required = false)
private String snp;
@ApiParam(value = "包装规格")
@AnnoOutputColumn
private String packageSpec;
@ApiParam(value = "备注")
@AnnoOutputColumn(required = false)
private String memo;
@ApiParam(value = "行数")
@AnnoOutputColumn(required = false)
private Integer rows;
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesCellFeedRecord;
/**
* @Description :
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-17 09:53
* @Modify:
**/
public interface MesCellFeedRecordRepository extends BaseRepository<MesCellFeedRecord, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesMouldPart;
import cn.estsh.i3plus.pojo.mes.bean.MesPart;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesMouldPartRepository extends BaseRepository<MesMouldPart, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPartSample;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesPartSampleRepository extends BaseRepository<MesPartSample, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPart;
import cn.estsh.i3plus.pojo.mes.bean.MesPartTakt;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesPartTaktRepository extends BaseRepository<MesPartTakt, Long> {
}

@ -11,8 +11,10 @@ import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect;
import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.List;
/**
* @Description:
* @Reference: Mes
@ -2003,11 +2005,14 @@ public class MesHqlPack {
* @param organizeCode
* @return
*/
public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode) {
public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode, List<String> serialNumbers) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdBindRecord, organizeCode);
if (!StringUtils.isEmpty(mesProdBindRecord.getItemPartNo())) {
DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean);
}
if (!CollectionUtils.isEmpty(serialNumbers)) {
DdlPreparedPack.getInPackList(serialNumbers, "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) {
DdlPreparedPack.getStringEqualPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean);
}

@ -111,12 +111,28 @@ public class MesPcnHqlPack {
return packBean;
}
/**
*
*
* @param mesCellFeedRecord
* @param org
* @return
*/
public static DdlPackBean getMesCellFeedRecord(MesCellFeedRecord mesCellFeedRecord, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(mesCellFeedRecord.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
return packBean;
}
/**
* BOM
*
* @param stationBom
* @param rawPartSn
* @param rawPartNo
* @return
*/
public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) {
@ -600,4 +616,47 @@ public class MesPcnHqlPack {
return endIndex;
}
/**
*
*
* @param mesWorkOrder
* @return
*/
public static DdlPackBean getWorkOrderList(MesWorkOrder mesWorkOrder, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkOrder, organizeCode);
if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
}
if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
}
if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus())) {
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
}
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
// 时间段查询
if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getStartTimeStart(),
mesWorkOrder.getStartTimeEnd(),
"startTime", packBean, true);
}
if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getEndTimeStart(),
mesWorkOrder.getEndTimeEnd(),
"endTime", packBean, true);
}
if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getCreateDateTimeStart(),
mesWorkOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
}

@ -126,10 +126,19 @@ public class SapDocFgSum extends BaseBean {
@ApiParam(value = "产品报工orderNo")
private String fGOrderNo;
@Column(name = "SEQ_NO")
@ApiParam(value = "父位置号")
private String seqNo;
@Column(name = "ITEM_SEQ_NO")
@ApiParam(value = "子位置号")
private String itemSeqNo;
public SapDocFgSum(){}
public SapDocFgSum(Long wdfdId, Double qty, String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo,
String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, String effStartTime, String bomVersion, String fGOrderNo) {
String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock,
String effStartTime, String bomVersion, String fGOrderNo, String seqNo, String itemSeqNo) {
this.wdfdId = wdfdId;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
@ -147,6 +156,8 @@ public class SapDocFgSum extends BaseBean {
this.effStartTime = effStartTime;
this.bomVersion = bomVersion;
this.fGOrderNo = fGOrderNo;
this.seqNo = seqNo;
this.itemSeqNo = itemSeqNo;
}
public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo,
String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) {

@ -156,13 +156,21 @@ public class WmsDocFgDetail extends BaseBean {
@ApiParam(value = "BOM版本号")
private String bomVersion;
@Column(name = "FIX_LOT_NO", nullable = false)
@ApiParam(value = "特殊批次")
private String fixLotNo = "";
@Column(name = "PACKAGE_NO")
@ApiParam(value = "包装编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String packageNo;
@Column(name = "FIX_LOT_NO", nullable = false)
@ApiParam(value = "特殊批次")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String fixLotNo = "";
@Column(name = "SEQ_NO")
@ApiParam(value = "父位置号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String seqNo;
@Column(name = "ITEM_SEQ_NO")
@ApiParam(value = "子位置号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String itemSeqNo;
}

@ -232,6 +232,10 @@ public class WmsDocMovementDetails extends BaseBean {
private String seqNo;
@Transient
@ApiParam(value = "客户编号")
private String custNo;
@Transient
@ApiParam(value = "替代物料编码")
private String subPartNo;
@ -421,4 +425,30 @@ public class WmsDocMovementDetails extends BaseBean {
this.planDate = poMasterDetails.getPlanDate();
this.planTime = poMasterDetails.getPlanTime();
}
public WmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails,Integer busiType,String srcZoneNo,String destZoneNo,
String custNo) {
this.orderNo = wmsDocMovementDetails.getOrderNo();
this.partNo = wmsDocMovementDetails.getPartNo();
this.qty = wmsDocMovementDetails.getQty();
this.taskGenerateQty = wmsDocMovementDetails.getTaskGenerateQty();
this.partNameRdd = wmsDocMovementDetails.getPartNameRdd();
this.unit = wmsDocMovementDetails.getUnit();
this.custNo = wmsDocMovementDetails.getCustNo();
this.srcZoneNo = wmsDocMovementDetails.getSrcZoneNo();
this.srcWhNo = wmsDocMovementDetails.getSrcWhNo();
this.srcLocateNo = wmsDocMovementDetails.getSrcLocateNo();
this.destWhNo = wmsDocMovementDetails.getDestWhNo();
this.destZoneNo = wmsDocMovementDetails.getDestZoneNo();
this.destLocateNo = wmsDocMovementDetails.getDestLocateNo();
this.srcAreaNo = wmsDocMovementDetails.getSrcAreaNo();
this.destAreaNo = wmsDocMovementDetails.getDestAreaNo();
this.destLocateNo = wmsDocMovementDetails.getDestLocateNo();
this.organizeCode = wmsDocMovementDetails.getOrganizeCode();
this.busiType = busiType;
this.srcZoneNo = srcZoneNo;
this.destZoneNo = destZoneNo;
this.custNo = custNo;
}
}

@ -340,7 +340,7 @@ public class WmsMoveSn extends BaseBean {
}
public WmsMoveSn(Long id,String organizeCode,String outRefSrc,String rcRefSrc,String outSn,String rcSn,
String rcPartNo,String outPartNo,String outUnit,String rcUnit, Double outQty ,Double rcQty,
String outPartNo,String rcPartNo,String outUnit,String rcUnit, Double outQty ,Double rcQty,
String outDatetime,String rcDatetime ,String vendorNo, String modifyUser,String modifyDatetime) {
this.id = id;
this.organizeCode = organizeCode;

@ -745,7 +745,7 @@ public class WmsStockSn extends BaseBean {
String shippingFlag, String workCenterCode, Integer snType,
String packagePartNo, Integer useCount, Integer seqNo,
String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc,
String prodCfgTypeName, String custNameRdd) {
String prodCfgTypeName, String custNameRdd, String workOrderCode) {
this.organizeCode = organizeCode;
this.id = id;
this.sn = sn;
@ -791,7 +791,7 @@ public class WmsStockSn extends BaseBean {
this.partTypeDesc = partTypeDesc;
this.prodCfgTypeName = prodCfgTypeName;
this.custNameRdd = custNameRdd;
this.vendorNameRdd = vendorNameRdd;
this.workOrderCode = workOrderCode;
}

@ -9,8 +9,13 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.math.BigDecimal;
import java.util.List;
/**
* @Description :
@ -140,6 +145,11 @@ public class WmsTaskDetails extends BaseBean {
@ApiParam("交易类型")
public String transTypeCodeRdd;
@Transient
@ApiParam("工厂代码集合")
private List<String> organizeCodeList;
public Double getQty() {
return this.qty == null ? 0 : this.qty;
}

@ -77,6 +77,10 @@ public class WmsTransType extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_BACK_TYPE.class, refForeignKey = "value", value = "description")
private Integer orderBackType;
@Column(name = "TM_NAME")
@ApiParam(value = "交易处理组件名称")
private String tmName;
@Transient
@ApiParam("菜单URL")
private String menuUrl;

@ -0,0 +1,27 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import lombok.Data;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2020-06-22 18:59
* @Modify:
**/
@Data
public class WmsAutoTaskModel {
String lockLocacte;
String lockCar;
Integer busiType;
String srcZoneNo;
String descZoneNo;
List<String> partList;
String organizeCode;
}

@ -224,6 +224,7 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getErpSrcNo(), "erpSrcNo", packBean);
DdlPreparedPack.getInPackList(wmsDocMovementMaster.getOrganizeCodeList(), "organizeCode", packBean);
getStringBuilderPack(wmsDocMovementMaster, packBean);
@ -1912,6 +1913,7 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsTaskDetails(WmsTaskDetails taskDetails) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(taskDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getInPackList(taskDetails.getOrganizeCodeList(), "organizeCode", result);
getStringBuilderPack(taskDetails, result);
return result;
}

@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
# defaults to project key
sonar.projectName=i3plus-pojo
# defaults to 'not provided'
sonar.projectVersion=1.0-PROD-SNAPSHOT
sonar.projectVersion=1.0-DEV-SNAPSHOT
# Path is relative to the sonar-project.properties file. Defaults to .
#sonar.sources=./

Loading…
Cancel
Save