yun-zuoyi
曾贞一 5 years ago
commit a0b50da83e

@ -3716,11 +3716,11 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCE_SN_QC_STATUS {
PRE_CHECK(5, "待检测"),
QUALIFIED(10, "合格"),
DEFECTED(20, "不合格"),
SCRAPED(30, "报废"),
DISMANTLED(40, "已拆解"),
PRE_CHECK(50, "待检测");
DISMANTLED(40, "已拆解");
private int value;
private String description;
@ -4044,7 +4044,8 @@ public class MesEnumUtil {
PCN_MODULE(180, "PCN_MODULE", ""),
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_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
PCN_IMAGE_NGINX(220, "PCN_IMAGE_NGINX", "PCN_IMAGE_NGINX");
private int value;
private String code;
@ -7055,4 +7056,41 @@ public class MesEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_START_CACHE_STATUS {
PENDING(10, "待处理"),
PROCESSED(20, "已处理");
private int value;
private String description;
WORK_START_CACHE_STATUS(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;
}
}
}

@ -4935,4 +4935,68 @@ public class MesPcnEnumUtil {
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STEP_DISPLAY_CLASS {
WHITE(10, "white"),
LIGHT_BLUE(20, "lightBlue");
private Integer value;
private String description;
STEP_DISPLAY_CLASS(Integer value, String description) {
this.value = value;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(Integer value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
tmp = values()[i].description;
}
}
return tmp;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROMPT_SOUND {
SUCCESS(10, "扫描成功"),
FAILURE(20, "扫描失败");
private Integer value;
private String description;
PROMPT_SOUND(Integer value, String description) {
this.value = value;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(Integer value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

@ -27,7 +27,8 @@ import java.math.BigDecimal;
@Table(name = "MES_PRODUCE_SN", indexes = {
@Index(columnList = "PRODUCT_SN"),
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "PART_NO")
@Index(columnList = "PART_NO"),
@Index(columnList = "WORK_ORDER_NO")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"})
})

@ -28,7 +28,10 @@ import java.io.Serializable;
@Index(columnList = "PRODUCT_SN"),
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "PART_NO"),
@Index(columnList = "MODIFY_DATE_TIME")
@Index(columnList = "MODIFY_DATE_TIME"),
@Index(columnList = "WORK_CENTER_CODE"),
@Index(columnList = "WORK_CELL_CODE"),
@Index(columnList = "WORK_ORDER_NO")
})
@Api("产品条码履历表")
public class MesProduceSnTravel extends BaseBean implements Serializable {

@ -74,6 +74,10 @@ public class MesWorkCell extends BaseBean implements Serializable {
@ApiParam("目标合格率")
private Double targetPassRate;
@Column(name = "STAND_TAKT")
@ApiParam("标准节拍")
private Integer standTakt;
@Transient
@ApiParam(value = "子集列表")
private List<MesEquipment> childTreeList;

@ -346,6 +346,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam(value = "子零件总数", example = "0")
private Double itemQtyCount = 0d;
@Transient
@ApiParam("是否虚拟件")
private Integer isFictive = 2;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

@ -0,0 +1,53 @@
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.Lob;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :MES_
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-28
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_START_CACHE")
@Api("MES_工单启动池")
public class MesWorkStartCache extends BaseBean implements Serializable {
private static final long serialVersionUID = 4320604250440221045L;
@Column(name = "ORDER_NO")
@ApiParam("工单号")
private String orderNo;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "ACTUAL_START_TIME")
@ApiParam("实际启动时间")
private String actualStartTime;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
}

@ -0,0 +1,25 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/9/2 5:00
* @Modify:
*/
@Data
public class AssistModuleModel {
@ApiParam("标准节拍")
private Integer standTakt;
@ApiParam("x坐标内容")
private List<String> xAxis;
@ApiParam("y坐标内容")
private List<String> yAxis;
}

@ -88,6 +88,9 @@ public class GenSerialNoModel {
@ApiParam("零件号后4位")
private String partNoAfterFour;
@ApiParam("客户工厂代码")
private String custProdLineCode;
public GenSerialNoModel(String ruleCode) {
this.ruleCode = ruleCode;

@ -65,4 +65,7 @@ public class StationResultBean<T> implements Serializable {
@ApiParam("定时秒数")
private Integer timer;
@ApiParam("提示音 1234与前端约定")
private Integer promptSound;
}

@ -0,0 +1,18 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkStartCache;
import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author :
* @CreateDate : 2020-05-18 16:49
* @Modify:
**/
@Repository
public interface MesWorkStartCacheRepository extends BaseRepository<MesWorkStartCache, Long> {
}

@ -3276,4 +3276,21 @@ public class MesHqlPack {
DdlPreparedPack.getNumEqualPack(mesLocation.getIsValid(), "isValid", packBean);
return packBean;
}
/**
*
* @param snPhotoRelation
* @param organizeCode
* @return
*/
public static DdlPackBean getMesSnPhotoRelation(MesSnPhotoRelation snPhotoRelation, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(snPhotoRelation, organizeCode);
if (!StringUtils.isEmpty(snPhotoRelation.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(snPhotoRelation.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(snPhotoRelation.getPhotoName())) {
DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoName(), "photoName", packBean);
}
return packBean;
}
}

@ -21,4 +21,7 @@ public class WmsSapDbParamModel implements Serializable {
private String masterStatusName;//单据状态名
private String detailsTableName;//单据明细表名
private String snTableName;//单据条码表名
private String checkDetailCondition;//可以取消单据明细条件
private String checkSnCondition;//可以取消单据条码条件
}

@ -78,12 +78,15 @@ public class WmsTaskInfoModel implements Serializable {
@ApiParam(value = "跳转后端请求")
public String actionUrl;
@ApiParam(value = "作业人员")
public String userNo;
public WmsTaskInfoModel() {
}
public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo,
String createDatetime, String srcZoneNo, String createUser, String organizeCode) {
String createDatetime, String srcZoneNo, String createUser, String organizeCode,String userNo) {
this.orderNo = orderNo;
this.taskStatus = taskStatus;
this.opTypeName = opTypeName;
@ -98,6 +101,7 @@ public class WmsTaskInfoModel implements Serializable {
this.srcZoneNo = srcZoneNo;
this.createUser = createUser;
this.organizeCode = organizeCode;
this.userNo = userNo;
}
public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,

@ -119,6 +119,10 @@ public class WmsDocMovementDetails extends BaseBean {
private Integer itemStatus;
@Transient
@ApiParam(value = "完成状态")
public Integer orderStatus;
/**
*
*/

@ -0,0 +1,91 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : rock.yu
* @CreateDate : 2020-09-01 14:37
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_QC_SN_ERROR_LIST")
@Api("质检单条码质检不良清单表")
public class WmsQCSNErrorList extends BaseBean {
private static final long serialVersionUID = 7779401323803118985L;
@Column(name="ORDER_NO")
@ApiParam("单号")
public String orderNo;
@Column(name="ITEM")
@ApiParam("行号")
public String item;
/**
* :1=,10=
*/
@Column(name="ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
public Integer itemStatus;
@Column(name="REMARK")
@ApiParam("备注")
public String remark;
@Column(name="PASS_QTY", nullable = false)
@ApiParam("合格数量")
@ColumnDefault("0")
public double passQty;
@Column(name="REJECT_QTY", nullable = false)
@ApiParam("不合格数量")
@ColumnDefault("0")
public double rejectQty;
@Column(name="UNIT")
@ApiParam("单位")
public String unit;
@Column(name="PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="SN")
@ApiParam("条码")
public String sn;
@Column(name = "QC_USER")
@ApiParam("检验员")
public String qcUser;
@Column(name = "QC_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "检验时间", example = "2000-01-01 01:00:00")
public String qcTime;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编码")
public String vendorNo;
}

@ -96,4 +96,11 @@ public class WmsTransType extends BaseBean {
public long getTmIdVal() {
return this.tmId == null ? 0 : this.tmId;
}
public WmsTransType(String transTypeCode) {
this.transTypeCode = transTypeCode;
}
public WmsTransType() {
}
}

@ -16,7 +16,6 @@ import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails;
import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipDto;
import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
import com.alibaba.fastjson.JSONObject;
import com.google.common.base.Strings;
import org.apache.commons.lang3.StringUtils;
@ -24,8 +23,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
/**
* @Description :
@ -268,6 +265,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getShipmentNoteNumber(), "shipmentNoteNumber", result);
DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getContainerNo(), "containerNo", result);
if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) {
ArrayList<Integer> numList = new ArrayList<>();

Loading…
Cancel
Save