Jenkins自动合并

yun-zuoyi
jenkins 6 years ago
commit 3db9a86504

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
@ -37,6 +38,7 @@ public class MesPatternJis extends BaseBean {
@ApiParam("模式名称")
private String patternName;
@Lob
@Column(name = "RULE")
@ApiParam("规则")
private String rule;

@ -102,6 +102,7 @@ public class MesEquipmentModel implements Serializable {
}
//根据条件查询设备所有有效数据-设备作业任务下拉框 queryMesEquipmentListByParams
public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) {
this.id = id;
this.equipmentCode = equipmentCode;
@ -111,6 +112,8 @@ public class MesEquipmentModel implements Serializable {
this.equipmentCategory = equipmentCategory;
}
//根据生产线,工位获取设备集合 findMesEquipmentList
//获取设备分页数据-组织模型 queryMesEquipmentByPagerOrg
public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) {
this.wcId = wcId;
this.id = id;
@ -122,6 +125,7 @@ public class MesEquipmentModel implements Serializable {
this.areaCode = areaCode;
}
//根据条件查询设备所有有效数据-组织模型下拉框及联 queryMesEquipmentList
public MesEquipmentModel(Long id, String equipmentNameAndworkCellName, String equipmentCode, String equipmentName, Integer status, String areaCode, String workCenterCode, String workCellCode) {
this.id = id;
this.equipmentNameAndworkCellName = equipmentNameAndworkCellName;
@ -134,13 +138,13 @@ public class MesEquipmentModel implements Serializable {
}
public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, 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) {
//获取设备分页数据 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) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
this.status = status;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.areaCode = areaCode;
this.equipmentType = equipmentType;
this.equipmentCategory = equipmentCategory;

@ -159,7 +159,7 @@ public class WmsMoveMaster extends BaseBean {
@Transient
@ApiParam("总行数")
private Integer itemQty;
private Long itemQty;
// @Version
// @Column(name = "LOCK_VERSION")
@ -225,10 +225,10 @@ public class WmsMoveMaster extends BaseBean {
this.modifyDatetime = modifyDatetime;
}
public WmsMoveMaster(Integer itemQty , String transTypeCode , Integer itemStatus){
public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){
this.itemQty = itemQty;
this.transTypeCode = transTypeCode;
this.itemStatus = itemStatus;
this.orderStatus = orderStatus;
}
public Double getTransQty() {

@ -25,8 +25,8 @@ import javax.persistence.Table;
@Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = {
@Index(columnList = "FUNCTION_ID"),
@Index(columnList = "SEARCH_ELEMENT_ID"),
@Index(columnList = "IS_SHARE"),
@Index(columnList = "USER_CODE")
@Index(columnList = "USER_CODE"),
@Index(columnList = "SEARCH_NAME")
})
@DynamicInsert
@DynamicUpdate
@ -56,7 +56,14 @@ public class WmsSearchElementFunction extends BaseBean {
@ApiParam(value = "用户编号")
private String userCode;
/**
* 1-2-
*/
@Column(name = "IS_SHARE")
@ApiParam(value = "是否共享")
private Integer isShare;
@Column(name = "SEARCH_NAME")
@ApiParam(value = "搜索名称")
private String searchName;
}

@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.wms.bean.*;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction;
import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
@ -2727,4 +2729,19 @@ public class WmsHqlPack {
getStringBuilderPack(wmsFieldInfo, result);
return result;
}
/**
* WMS
*
* @param searchElementFunction
* @return
*/
public static DdlPackBean packHqlWmsSearchElementRecord(WmsSearchElementFunction searchElementFunction) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(searchElementFunction.getFunctionId(), "functionId", result);
DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result);
DdlPreparedPack.getStringEqualPack(searchElementFunction.getUserCode(), "userCode", result);
getStringBuilderPack(searchElementFunction, result);
return result;
}
}

Loading…
Cancel
Save