diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 1575b05..902b0bc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -120,7 +120,7 @@ public class AndonHqlPack { } /** - * 按条件查询ANDON呼叫原因 + * 按条件查询ANDON呼叫原因,== * @param andonAlarmCause * @return */ @@ -134,6 +134,22 @@ public class AndonHqlPack { return result; } + /** + * 按条件模糊查询ANDON呼叫原因, + * @param andonAlarmCause + * @return + */ + public static DdlPackBean packHqlAndonAlarmCauseLike(AndonAlarmCause andonAlarmCause){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcCode(),"acCode", result); + DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcName(),"acName", result); + + getStringBuilderPack(andonAlarmCause, result); + + return result; + } /** * 按条件查询ANDON事件处理方法 @@ -439,6 +455,11 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) { DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(andonEventCause.getEcCode(), "ecCode", result); + DdlPreparedPack.getStringLikerPack(andonEventCause.getEcName(), "ecName", result); + getStringBuilderPack(andonEventCause, result); return result; @@ -487,8 +508,29 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonPLC(AndonPLC plc) { DdlPackBean result = new DdlPackBean(); - getStringBuilderPack(plc, result); + DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(plc.getTagAddress(),"tagAddress",result); + DdlPreparedPack.getStringLikerPack(plc.getTagName(),"tagName",result); + + getStringBuilderPack(plc, result); return result; } + + /** + * 检查安灯记录是否以存在 + * @param andonManageRecord + * @return + */ + public static DdlPackBean packHqlAndonManageRecordIsExist(AndonManageRecord andonManageRecord){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonManageRecord.getAndonOrderNo(),"andonOrderNo", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getStatusCode(),"statusCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getAlarmCode(),"alarmCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getActionCode(),"actionCode", result); + + getStringBuilderPack(andonManageRecord, result); + return result; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 6dc423e..9788e06 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -242,25 +242,31 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_TYPE { - PART("PART_ALARM","物料"), - QUALITY("QUALITY_ALARM","质量"), - EQUIP("EQUMENT_ALARM","设备"), - PROCESS("ROUTING_ALARM","工艺"), - CHECK("OTHER_ALARM","其他"), - FIX_ERROR("FIX_ERROR", "自动报警"); + PART("PART_ALARM", 111020005, "物料"), + QUALITY("QUALITY_ALARM", 111020006, "质量"), + EQUIP("EQUMENT_ALARM", 111020007, "设备"), + PROCESS("ROUTING_ALARM", 111020008, "工艺"), + CHECK("OTHER_ALARM", 111020009, "其他"), + FIX_ERROR("FIX_ERROR", 111020010, "自动报警"); private String value; + private Integer code; private String description; - ALARM_TYPE(String value, String description) { + ALARM_TYPE(String value, Integer code, String description) { this.value = value; + this.code = code; this.description = description; } - public String getValue() { + public String getValue() { return value; } + public Integer getCode() { + return code; + } + public String getDescription() { return description; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 9bba3de..457faaa 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1082,7 +1082,8 @@ public class WmsEnumUtil { CREATE(10, "创建"), BE_HANDLE(20, "待处理"), FINISH(30, "已处理"), - HANDLE_ERROR(40, "处理出错"); + HANDLE_ERROR(40, "处理出错"), + TEST(50, "调试"); private int value; private String description; @@ -2505,7 +2506,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_PART_TYPE { - RAW_MATERIAL(1, "原材料"), PARTIALLY_PREPARED_PRODUCTS(2, "半成品"), FINISHED_PRODUCT(3, "成品"); + RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"); private int value; private String description; @@ -2693,7 +2694,7 @@ public class WmsEnumUtil { public enum SRC_STATUS { ZMMES("ZMMES", "知明MES"), TBMES("TBMES", "MES接口"), - AMP("AMP","AMP系统"); + AMP("AMP", "AMP系统"); private String value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 5427a91..efc024e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -99,8 +99,16 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("源仓库编号") public String srcWhNo; + @Column + @ApiParam("是否范围内") + public Integer isScope; + public WmsCSFactTrans(){} + public Integer getIsScopeVal() { + return isScope== null ? 0 : this.isScope.intValue(); + } + public WmsCSFactTrans(Double factQty, String partNo){ if(factQty == null) { this.factQty = 0d; @@ -109,4 +117,20 @@ public class WmsCSFactTrans extends BaseBean { } this.partNo = partNo; } + + public WmsCSFactTrans(String orderNo, String whNo, String zoneNo, String locateNo,Double factQty, String partNo, String partNameRdd, String sn, Double qty, String unit, String srcLocateNo, String srcZoneNo, String srcWhNo) { + this.orderNo = orderNo; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.factQty = factQty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.sn = sn; + this.qty = qty; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.srcZoneNo = srcZoneNo; + this.srcWhNo = srcWhNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index a4b9feb..24e000d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -68,4 +68,18 @@ public class WmsLocatePart extends BaseBean { public Integer getIsGeneratePicklist() { return this.isGeneratePicklist == null ? 0 : this.isGeneratePicklist; } + + public double getPullQtyValue(){ + return this.pullQty ==null?0d:this.pullQty.doubleValue(); + } + + public double getMaxValue(){ + return this.max ==null?0:this.max.doubleValue(); + } + + public double getMinValue(){ + return this.min ==null?0:this.min.doubleValue(); + } + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 73a9619..4c690e0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -122,42 +122,50 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量", example = "0") private Double scrapQty; - public Double getQty() { + @Transient + @ApiParam(value = "总数量") + private Double totalQty; + + public Double getQtyVal() { return this.qty == null ? 0 : this.qty; } - public Double getFailQty() { + public Double getFailQtyVal() { return this.failQty == null ? 0 : this.failQty; } - public Double getHoldQty() { + public Double getHoldQtyVal() { return this.holdQty == null ? 0 : this.holdQty; } - public Double getQcQty() { + public Double getQcQtyVal() { return this.qcQty == null ? 0 : this.qcQty; } - public Double getRinQty() { + public Double getRinQtyVal() { return this.rinQty == null ? 0 : this.rinQty; } - public Double getFreezeQty() { + public Double getFreezeQtyVal() { return this.freezeQty == null ? 0 : this.freezeQty; } - public Double getConsignQty() { + public Double getConsignQtyVal() { return this.consignQty == null ? 0 : this.consignQty; } - public Double getLockQty() { + public Double getLockQtyVal() { return this.lockQty == null ? 0 : this.lockQty; } - public Double getScrapQty() { + public Double getScrapQtyVal() { return this.scrapQty == null ? 0 : this.scrapQty; } + public Double getTotalVal() { + return this.totalQty == null ? 0 : this.totalQty; + } + public WmsStockQuan() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index 10a2c6a..59ed0dd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -40,4 +40,8 @@ public class WmsUnit extends BaseBean { @ApiParam(value = "单位精度") private Integer unitPrecision; + public int getUnitPrecisionValue(){ + return this.unitPrecision == null?0:this.unitPrecision.intValue(); + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index f1c64dd..0d9a204 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -412,7 +412,11 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); - DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); + if(wmsLocate.getZoneNo() != null){ + DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))),","),"",result); + } + + // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); getStringBuilderPack(wmsLocate, result);