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 34ed60e..dd9d0c1 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 @@ -44,6 +44,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAlarmCode(), "alarmCode", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAndonOrderNo(), "andonOrderNo", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpCode(), "rpCode", packBean); + DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpLevel(), "rpLevel", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean); if(StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeEnd())){ 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 80956f8..c06ad50 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 @@ -4180,4 +4180,51 @@ public class WmsEnumUtil { } } + /** + * 客户发运 发运数量控制 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SHIPP_QTY_CONTROL { + LESS_SEND(10, "少发"), + MANY_SEND(20, "多发"), + CONSISTENT(30, "一致"), + NO_CONTROL(40, "不控制"); + + private int value; + private String description; + + SHIPP_QTY_CONTROL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static SHIPP_QTY_CONTROL codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 5fdefdd..620fa7d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -25,7 +25,6 @@ public interface BaseRepository extends JpaReposito * 字符串,并且没有赋值,该方法将自动设置为uuid值 * @param item * 持久对象,或者对象集合 - * @throws Exception */ T insert(T item); @@ -36,7 +35,6 @@ public interface BaseRepository extends JpaReposito * @param item * 持久对象,或者对象集合 * @param initParam 是否需要初始化值为null的属性, - * @throws Exception */ T insert(T item,boolean initParam); @@ -45,7 +43,6 @@ public interface BaseRepository extends JpaReposito * * @param item * 持久对象,或者对象集合 - * @throws Exception */ void update(Object... item); @@ -73,7 +70,6 @@ public interface BaseRepository extends JpaReposito * @param qlString 基于jpa标准的ql语句 * @param values ql中的T参数值 * @return 返回执行后受影响的数据个数 - * @throws Exception */ int executeUpdate(String qlString, List values); diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java index c8316cc..a67a223 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java @@ -24,13 +24,13 @@ public class MesButtonFlagModel implements Serializable { private boolean updateButton; // @ApiParam("按配置修改按钮") -// private boolean updateButton4Config; +// private boolean updateButtonConfig; @ApiParam("下达按钮") private boolean transmitButton; // @ApiParam("测试动态下达按钮") -// private boolean dynamicTransmitButton4Test; +// private boolean dynamicTransmitButtonTest; @ApiParam("启动按钮") private boolean startUpButton; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index f2a841b..bf98ee4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -60,4 +60,8 @@ public class BasCustomer extends BaseBean { @Column(name = "CUST_FAX") @ApiParam(value = "传真") private String custFax; + + @Column(name = "SHIPP_QTY") + @ApiParam(value = "发运数量控制") + private Integer shippQty; }