diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index a39b0e4..0294208 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -393,7 +393,67 @@ public class CommonEnumUtil { return tmp; } } + /** + * 数据类型 + * 1库存移动数据 + * 2质检数据 + * 3已配料待出库 + * 4JIS发运扣减 + * 5报工待汇总 + * 6报工汇总待处理 + * 7erp接口待同步 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum NUM_TYPE { + MOVE_DETAILS(1, "MOVE_DETAILS", "库存移动数据"), + QC_DETAILS(2, "QC_DETAILS", "质检数据"), + DOC_MOVEMENT(3, "DOC_MOVEMENT", "已配料待出库"), + DOC_SHIPPING(4, "DOC_SHIPPING", "JIS发运扣减"), + FG_DETAILS(5, "FG_DETAILS", "报工待汇总"), + FG_SUM(6, "FG_SUM", "报工汇总待处理"), + ERP_INTERFACE(7, "ERP_INTERFACE", "ERP接口待同步"); + private int value; + private String code; + private String description; + + private NUM_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_INFO_STATUS { INCUMBENT(1, "正常", "正常_NORMAL"), diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index f249d04..f05d963 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import org.apache.commons.lang3.StringUtils; + import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Date; @@ -47,8 +48,8 @@ public class DdlPreparedPack { endDate += " 23:59:59"; } - packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, startDate); - packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, endDate); + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, startDate); + packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, endDate); } /** @@ -94,9 +95,9 @@ public class DdlPreparedPack { String[] time = date.split(","); if (time.length == 1) { //只有开始日期，没有结束日期 - packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%"); + packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%"); } else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0) - || (time[1] != null & time[1].trim().length() > 0))) { + || (time[1] != null & time[1].trim().length() > 0))) { if (time[0] == null || time[0].trim().length() == 0) { time[0] = "1900-01-01"; } else { @@ -113,16 +114,16 @@ public class DdlPreparedPack { if (isShowTime && time[1].trim().length() <= 11) { time[1] += " 23:59:59"; } - packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, time[0]); - packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, time[1]); + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, time[0]); + packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, time[1]); } else { if (showTaday) { if (isShowTime) { - packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today + " 00:00:00"); - packBean.addColumnQuery("s_" + columnName," and model." + columnName + " <= :m_s_"+ columnName, today + " 23:59:59"); + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, today + " 00:00:00"); + packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, today + " 23:59:59"); } else { - packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today); - packBean.addColumnQuery("s_" + columnName," and model." + columnName + " <= :m_s_" + columnName, today); + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, today); + packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, today); } } } @@ -147,14 +148,14 @@ public class DdlPreparedPack { } if (!isShowTime) { date = date.substring(0, 10); - packBean.addColumnQuery(null," and '" + date + "' between substring(model." + startColumnName - + ",1,10) and substring(model." + endColumnName + ",1,10)", null); + packBean.addColumnQuery(null, " and '" + date + "' between substring(model." + startColumnName + + ",1,10) and substring(model." + endColumnName + ",1,10)", null); return; } else if (date.trim().length() <= 11) { date += " 00:00:00"; } - packBean.addColumnQuery(null," and '" + date + "' between model." + startColumnName - + " and model." + endColumnName, null); + packBean.addColumnQuery(null, " and '" + date + "' between model." + startColumnName + + " and model." + endColumnName, null); } /** @@ -173,9 +174,9 @@ public class DdlPreparedPack { } else { order[i] = "desc"; } - if(columnName[i].indexOf(" model.") == -1){ + if (columnName[i].indexOf(" model.") == -1) { sqlStr += " model." + columnName[i]; - }else{ + } else { sqlStr += columnName[i]; } sqlStr += " " + order[i].toString() + ","; @@ -209,7 +210,7 @@ public class DdlPreparedPack { */ public static void getStringLikerPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + val + "%"); + packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val + "%"); } } @@ -222,7 +223,7 @@ public class DdlPreparedPack { */ public static void getStringLikerPackOr(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName," or model." + columnName + " like :m_" + columnName, "%" + val + "%"); + packBean.addColumnQuery(columnName, " or model." + columnName + " like :m_" + columnName, "%" + val + "%"); } } @@ -235,7 +236,7 @@ public class DdlPreparedPack { */ public static void getStringRightLikerPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, val + "%"); + packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val + "%"); } } @@ -248,7 +249,7 @@ public class DdlPreparedPack { */ public static void getStringLeftLikerPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + val); + packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val); } } @@ -260,7 +261,7 @@ public class DdlPreparedPack { */ public static void getStringEqualPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, val); + packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val); } } @@ -272,7 +273,7 @@ public class DdlPreparedPack { */ public static void getStringNoEqualPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, val); + packBean.addColumnQuery(columnName, " and model." + columnName + " <> :m_" + columnName, val); } } @@ -283,7 +284,7 @@ public class DdlPreparedPack { * @param packBean */ public static void getStringNotNullPack(String columnName, DdlPackBean packBean) { - packBean.addColumnQuery(null," and model." + columnName + " is not null", null); + packBean.addColumnQuery(null, " and model." + columnName + " is not null", null); } /** @@ -294,7 +295,7 @@ public class DdlPreparedPack { */ public static void getStringEqualPackOr(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName," or model." + columnName + " = :m_" + columnName, val); + packBean.addColumnQuery(columnName, " or model." + columnName + " = :m_" + columnName, val); } } @@ -306,7 +307,7 @@ public class DdlPreparedPack { */ public static void getNumEqualPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && Long.parseLong(data.toString()) > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data); } } @@ -318,7 +319,7 @@ public class DdlPreparedPack { */ public static void getNegativeNumEqualPack(Object data, String columnName, DdlPackBean packBean) { if (data != null) { - packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data); } } @@ -330,7 +331,7 @@ public class DdlPreparedPack { */ public static void getNumEqualPackOr(Object data, String columnName, DdlPackBean packBean) { if (data != null && Long.parseLong(data.toString()) > 0) { - packBean.addColumnQuery(columnName," or model." + columnName + " = :m_" + columnName, data); + packBean.addColumnQuery(columnName, " or model." + columnName + " = :m_" + columnName, data); } } @@ -342,7 +343,7 @@ public class DdlPreparedPack { */ public static void getNumEqualPackOverZero(Object data, String columnName, DdlPackBean packBean) { if (data != null && Double.parseDouble(data.toString()) > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data); } } @@ -354,7 +355,7 @@ public class DdlPreparedPack { */ public static void getNumWithZeroEqualPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && Double.parseDouble(data.toString()) >= 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data); } } @@ -366,7 +367,7 @@ public class DdlPreparedPack { */ public static void getStringBiggerPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { - packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data); } } @@ -390,7 +391,7 @@ public class DdlPreparedPack { */ public static void getStringSmallerPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { - packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, data); + packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, data); } } @@ -402,7 +403,7 @@ public class DdlPreparedPack { */ public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { - packBean.addColumnQuery("s_"+columnName," and model." + columnName + " < :m_s_" + columnName, data); + packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " < :m_s_" + columnName, data); } } @@ -414,9 +415,22 @@ public class DdlPreparedPack { */ public static void getNumberBiggerPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && Double.parseDouble(data.toString()) > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " > :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data); } } + + /** + * 封装double对象成大于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPackContainsZero(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data); + } + } + /** * 封装double对象成大于等于语句 * @@ -425,7 +439,7 @@ public class DdlPreparedPack { */ public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && Double.parseDouble(data.toString()) > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data); } } @@ -437,9 +451,10 @@ public class DdlPreparedPack { */ public static void getNumberSmallerPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && Double.parseDouble(data.toString()) > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " < :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " < :m_" + columnName, data); } } + /** * 封装double对象成小于等于语句 * @@ -448,7 +463,7 @@ public class DdlPreparedPack { */ public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && Double.parseDouble(data.toString()) > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " <= :m_" + columnName, data); } } @@ -460,7 +475,7 @@ public class DdlPreparedPack { */ public static void getNumNOEqualPack(Object data, String columnName, DdlPackBean packBean) { if (data != null) { - packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " <> :m_" + columnName, data); } } @@ -473,7 +488,7 @@ public class DdlPreparedPack { */ public static void getInPack(Object data, String columnName, DdlPackBean packBean) { if (data != null) { - packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName, " and model." + columnName + " in (:m_" + columnName + ")", data); } } @@ -486,7 +501,7 @@ public class DdlPreparedPack { */ public static void getOrInPack(String data, String columnName, DdlPackBean packBean) { if (data != null) { - packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName, " or model." + columnName + " in (:m_" + columnName + ")", data); } } @@ -499,7 +514,7 @@ public class DdlPreparedPack { */ public static void getInPackArray(Object[] data, String columnName, DdlPackBean packBean) { if (data != null && data.length > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data)); + packBean.addColumnQuery(columnName, " and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data)); } } @@ -512,7 +527,7 @@ public class DdlPreparedPack { */ public static void getNotInPackArray(Object[] data, String columnName, DdlPackBean packBean) { if (data != null && data.length > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data)); + packBean.addColumnQuery(columnName, " and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data)); } } @@ -525,7 +540,7 @@ public class DdlPreparedPack { */ public static void getInPackList(List data, String columnName, DdlPackBean packBean) { if (data != null && data.size() > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName, " and model." + columnName + " in (:m_" + columnName + ")", data); } } @@ -538,7 +553,7 @@ public class DdlPreparedPack { */ public static void getNotInPackList(List data, String columnName, DdlPackBean packBean) { if (data != null && data.size() > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + "not in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName, " and model." + columnName + "not in (:m_" + columnName + ")", data); } } @@ -564,7 +579,7 @@ public class DdlPreparedPack { data += "'" + dataArray[i] + "',"; } } - packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName, " or model." + columnName + " in (:m_" + columnName + ")", data); } } @@ -590,7 +605,7 @@ public class DdlPreparedPack { data += "'" + dataArray[i] + "',"; } } - packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName, " and " + columnName + " not in (:m_" + columnName + ")", data); } } @@ -603,26 +618,27 @@ public class DdlPreparedPack { */ public static void getNotInPack(Object data, String columnName, DdlPackBean packBean) { if (data != null) { - packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName, " and " + columnName + " not in (:m_" + columnName + ")", data); } } /** * 转换排序列 + * * @param columnName 列名 - * @param basisType 基本类型 - * @see CommonEnumUtil.BASIS_TYPE + * @param basisType 基本类型 * @return + * @see CommonEnumUtil.BASIS_TYPE */ - public static String getOrderColConvertType(String columnName,int basisType){ - String name =" model." + columnName; + public static String getOrderColConvertType(String columnName, int basisType) { + String name = " model." + columnName; if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) { - name = " cast(" + name+ " as integer)"; - } else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()){ - name = " cast(" + name+ " as double)"; - } else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()){ - name = " cast(" + name+ " as long)"; + name = " cast(" + name + " as integer)"; + } else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()) { + name = " cast(" + name + " as double)"; + } else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()) { + name = " cast(" + name + " as long)"; } return name; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index ee94479..069b395 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -55,6 +55,10 @@ public class MesEquipment extends BaseBean { @ApiParam("区域代码") private String areaCode; + @Column(name="CONNECT_TYPE") + @ApiParam("连接类型") + private Integer connectType; + @Transient @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index b236374..9efc5aa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -42,7 +42,7 @@ public class AmpJisRec extends BaseBean{ @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java index fd7a488..f5fde23 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java @@ -42,7 +42,7 @@ public class AmpStockCurrent extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index 612276b..250b6a7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -46,7 +46,7 @@ public class SapDocFgSum extends BaseBean { @ApiParam("单位") public String partNameRdd; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; @@ -75,7 +75,7 @@ public class SapDocFgSum extends BaseBean { @ApiParam("子计量单位") public String itemUnit; - @Column(name="ITEM_QTY") + @Column(name="ITEM_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "子用量", example = "0") public Double itemQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 85dc1d4..0666d27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -45,7 +45,7 @@ public class WmsASNMasterDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -112,7 +112,7 @@ public class WmsASNMasterDetails extends BaseBean { @ApiParam("供应商批次") public String vendorLotNo; - @Column(name = "REC_QTY") + @Column(name = "REC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已收数量", example = "0") public Double recQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index cd708d3..dfdad1f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -43,7 +43,7 @@ public class WmsBom extends BaseBean { @ApiParam(value = "计量单位") private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "数量") private Double qty; @@ -59,7 +59,7 @@ public class WmsBom extends BaseBean { @ApiParam(value = "子计量单位") private String itemUnit; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "子用量") private Double itemQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index 6ecb5c0..263cc0e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -40,7 +40,7 @@ public class WmsBomTotal extends BaseBean { @ApiParam("计量单位") private String UNIT; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam("数量") private Double qty; @@ -56,7 +56,7 @@ public class WmsBomTotal extends BaseBean { @ApiParam(value = "子计量单位") private String itemUnit; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "子用量") private Double itemQty; 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 421410e..9722217 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 @@ -61,7 +61,7 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("条码") public String sn; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "库存数量", example = "0") public Double qty; @@ -70,7 +70,7 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("单位") public String unit; - @Column(name="FACT_QTY") + @Column(name="FACT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "实盘数量", example = "0") public Double factQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index d101b27..6461ae8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -44,7 +44,7 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java index d4a9c99..f39695e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java @@ -66,11 +66,11 @@ public class WmsCheckFactRecord extends BaseBean { @ApiParam("备注") public String remark; - @Column(name="PLAN_QTY") + @Column(name="PLAN_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "应收数量", example = "0") public Double planQty; - @Column(name="CHECK_QTY") + @Column(name="CHECK_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "抽点数量", example = "0") public Double checkQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index f2c20af..79c7f34 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -66,7 +66,7 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam("BOM切换标识") public String bomUpdate; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; @@ -91,7 +91,7 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam("子计量单位") public String itemUnit; - @Column(name="ITEM_QTY") + @Column(name="ITEM_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "子用量", example = "0") public Double itemQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index eb39fc2..7dc5ac8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -46,7 +46,7 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -83,7 +83,7 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("目标库位代码") public String destLocateNo; - @Column(name = "PRINT_QTY") + @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "条码打印数量", example = "1") private Double printQty; @@ -119,22 +119,22 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "操作原因") private String remark; - @Column(name = "PICK_QTY") + @Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已拣货数量", example = "1") private Double pickQty; - @Column(name = "OUT_QTY") + @Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已出库数量", example = "1") private Double outQty; - @Column(name = "REC_QTY") + @Column(name = "REC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已收货数量", example = "1") private Double recQty; - @Column(name = "MOVE_QTY") + @Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已移库数量", example = "1") private Double moveQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index e6ba0ab..d546d76 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -52,7 +52,7 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java index 301b0ad..89184cf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java @@ -46,7 +46,7 @@ public class WmsFGInStock extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java index 8db0703..afc6da3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java @@ -59,15 +59,15 @@ public class WmsLineLocatePart extends BaseBean { return isGeneratePicklist== null ? 0: this.isGeneratePicklist.intValue(); } - @Column(name = "PULL_QTY") + @Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "拉动数量") private Double pullQty; - @Column(name = "Max") + @Column(name = "Max", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大值") private Double max; - @Column(name = "Min") + @Column(name = "Min", columnDefinition = "decimal(18,8)") @ApiParam(value = "最小值") private Double min; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index fad9c66..a7f54ae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -77,7 +77,7 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "最大包装数量", example = "-1") private Integer maxPackageQty; - @Column(name = "MAX_PART_QTY") + @Column(name = "MAX_PART_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大零件数量", example = "-1") private Double maxPartQty; @@ -93,7 +93,7 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "箱数", example = "-1") private Integer boxQty; - @Column(name = "PART_QTY") + @Column(name = "PART_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "零件数", example = "-1") private Double partQty; 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 7c10ba8..442a5c4 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 @@ -42,15 +42,15 @@ public class WmsLocatePart extends BaseBean { @ApiParam(value = "物料名称") private String partNameRdd; - @Column(name = "PULL_QTY") + @Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "拉动数量", example = "0") private Double pullQty; - @Column(name = "MAX") + @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大值", example = "0") private Double max; - @Column(name = "MIN") + @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最小值", example = "0") private Double min; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 21a3c0b..0cd2e2f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -24,7 +24,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_MOVE_DETAILS", indexes = { +@Table(name = "WMS_MOVE_DETAILS", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), @Index(columnList = "ORGANIZE_CODE") @@ -33,94 +33,94 @@ import javax.persistence.*; public class WmsMoveDetails extends BaseBean { private static final long serialVersionUID = -5898637337319011710L; - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; - @Column(name="ITEM") + @Column(name = "ITEM") @ApiParam(value = "行号", example = "0") public Integer item; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料编码") public String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") public String partNameRdd; - @Column(name="VENDOR_NO") + @Column(name = "VENDOR_NO") @ApiParam("供应商编号") public String vendorNo; - @Column(name="CUST_NO") + @Column(name = "CUST_NO") @ApiParam("客户编号") public String custNo; - @Column(name="TRANS_QTY") + @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "处理数量", example = "0") public Double transQty; - public Double getTransQty(){ + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } - @Column(name="REJECT_QTY") + @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "不合格处理数量", example = "0") public Double rejectQty; - public Double getRejectQty(){ + public Double getRejectQty() { return this.rejectQty == null ? 0 : this.rejectQty.doubleValue(); } - @Column(name="UNIT") + @Column(name = "UNIT") @ApiParam("单位") public String unit; - @Column(name="SRC_WH_NO") + @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") public String srcWhNo; - @Column(name="SRC_ZONE_NO") + @Column(name = "SRC_ZONE_NO") @ApiParam("源存储区代码") public String srcZoneNo; - @Column(name="SRC_LOCATE_NO") + @Column(name = "SRC_LOCATE_NO") @ApiParam("源库位代码") public String srcLocateNo; - @Column(name="DEST_WH_NO") + @Column(name = "DEST_WH_NO") @ApiParam("目标仓库代码") public String destWhNo; - @Column(name="DEST_ZONE_NO") + @Column(name = "DEST_ZONE_NO") @ApiParam("目标存储区代码") public String destZoneNo; - @Column(name="DEST_LOCATE_NO") + @Column(name = "DEST_LOCATE_NO") @ApiParam("目标库位代码") public String destLocateNo; /** * 状态:1=创建,10=待处理,20=已处理 */ - @Column(name="ITEM_STATUS") + @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer itemStatus; - @Column(name="REF_ITEM") + @Column(name = "REF_ITEM") @ApiParam("关联单据行号") public String refItem; /** * ASN,PO,SO */ - @Column(name="REF_TYPE") + @Column(name = "REF_TYPE") @ApiParam("关联单据类型") public String refType; - @Column(name="REF_SRC") + @Column(name = "REF_SRC") @ApiParam("关联单号") public String refSrc; @@ -150,7 +150,7 @@ public class WmsMoveDetails extends BaseBean { @Transient @ApiParam("业务类型编码") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") private Integer busiTypeCode; @Transient @@ -176,7 +176,7 @@ public class WmsMoveDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; + public Integer lockVersion; @Transient @ApiParam(value = "快照时间") @@ -200,20 +200,21 @@ public class WmsMoveDetails extends BaseBean { return fPartName; }*/ - public WmsMoveDetails(){} + public WmsMoveDetails() { + } - public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){ + public WmsMoveDetails(String partNo, Long waitingCounts, Long finishedCounts) { this.partNo = partNo; this.waitingCounts = waitingCounts; this.finishedCounts = finishedCounts; } - public WmsMoveDetails(String partNo, double transQty){ + public WmsMoveDetails(String partNo, double transQty) { this.partNo = partNo; this.transQty = transQty; } - public WmsMoveDetails(String orderNo){ + public WmsMoveDetails(String orderNo) { this.orderNo = orderNo; } @@ -225,8 +226,8 @@ public class WmsMoveDetails extends BaseBean { return finishedCounts == null ? 0L : this.finishedCounts; } - public WmsMoveDetails (String organizeCode,String partNo,String partNameRdd,String workCenterCode,String fPartNo,String fPartName,String unit,Double qty, - String createDateTime,String sn,String srcZoneNo){ + public WmsMoveDetails(String organizeCode, String partNo, String partNameRdd, String workCenterCode, String fPartNo, String fPartName, String unit, Double qty, + String createDateTime, String sn, String srcZoneNo) { this.organizeCode = organizeCode; this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -241,11 +242,11 @@ public class WmsMoveDetails extends BaseBean { } - public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode - ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo, - String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo, - Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode, - String createUser,String createDatetime,String modifyUser,String modifyDatetime){ + public WmsMoveDetails(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, String transTypeCode + , String transTypeName, Integer itemStatus, String unit, String srcWhNo, String destWhNo, + String srcZoneNo, String destZoneNo, String srcLocateNo, String destLocateNo, + Double transQty, Double rejectQty, String refSrc, String vendorNo, String custNo, Integer busiTypeCode, + String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.organizeCode = organizeCode; this.partNo = partNo; this.orderNo = orderNo; @@ -269,7 +270,7 @@ public class WmsMoveDetails extends BaseBean { this.busiTypeCode = busiTypeCode; this.createUser = createUser; this.createDatetime = createDatetime; - this.modifyDatetime =modifyDatetime; - this.modifyUser =modifyUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index d743cbe..4ea1543 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -83,7 +83,7 @@ public class WmsMoveSn extends BaseBean { @ApiParam("容器编号") public String packAgeNo; - @Column(name = "SRC_QTY") + @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "源数量", example = "0") public Double srcQty; @@ -120,12 +120,12 @@ public class WmsMoveSn extends BaseBean { @Transient private Long finishedCounts; - @Column(name = "DEST_QTY") + @Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "目标数量", example = "0") public Double destQty; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index a46cbea..66fbc2b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -84,11 +84,11 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("客户编号") public String custNo; - @Column(name="TRANS_QTY") + @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "处理数量", example = "0") public Double transQty; - @Column(name="REJECT_QTY") + @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "不合格处理数量", example = "0") public Double rejectQty; @@ -142,7 +142,7 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("关联单位") public String refUnit; - @Column(name="REF_QTY") + @Column(name="REF_QTY", columnDefinition = "decimal(18,8)") @ApiParam("关联数量") public Double refQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index f84a315..3f3e2b6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -50,7 +50,7 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("行号") private Integer item; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") private Double qty; @@ -67,28 +67,28 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("订单号") private String orderNo; - @Column(name = "PRINT_QTY") + @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "条码打印数量", example = "0") private Double printQty; //private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; } - @Column(name = "RC_QTY") + @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") private Double rcQty; //private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; } - @Column(name = "PASS_QTY") + @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "质检合格数量", example = "0") private Double passQty; //private Double getPassQty(){ return this.passQty == null ? new Double(0) : this.passQty; } - @Column(name = "NG_QTY") + @Column(name = "NG_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "质检不合格数量", example = "0") private Double ngQty; @@ -114,7 +114,7 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("状态") private Integer itemStatus; - @Column(name = "SNP") + @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam("标准包装") private Double snp; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java index bf51127..22dc007 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java @@ -41,11 +41,11 @@ public class WmsPackSn extends BaseBean { @ApiParam(value = "物料名称") private String partNameAdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam("数量") private Double qty; - @Column(name = "SID") + @Column(name = "SID", columnDefinition = "decimal(18,8)") @ApiParam("SID") private Double sId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index c63c5fc..8af7dae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -74,7 +74,7 @@ public class WmsPart extends BaseBean { @ApiParam(value = "采购单位") private String buyUnit; - @Column(name = "BU2SU") + @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率1", example = "1") private Double bu2su; @@ -82,11 +82,11 @@ public class WmsPart extends BaseBean { @ApiParam(value = "计价单位") private String priceUnit; - @Column(name = "PU2SU") + @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率2", example = "1") private Double pu2su; - @Column(name = "SNP") + @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam(value = "标准包装", example = "1") private Double snp; @@ -95,11 +95,11 @@ public class WmsPart extends BaseBean { @ApiParam(value = "是否免检", example = "1") private Integer iqc; - @Column(name = "MIN") + @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最低库存", example = "1") private Double min; - @Column(name = "MAX") + @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最高库存", example = "1") private Double max; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 53a91f8..4aaec5c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -51,7 +51,7 @@ public class WmsPoSn extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; @@ -84,7 +84,7 @@ public class WmsPoSn extends BaseBean { @ApiParam("组条码") public String groupNo; - @Column(name="REC_QTY") + @Column(name="REC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") public Double recQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index d58d624..d0275ca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -42,7 +42,7 @@ public class WmsQCDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -67,17 +67,17 @@ public class WmsQCDetails extends BaseBean { public String remark; - @Column(name = "FACT_QTY") + @Column(name = "FACT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "实检数量", example = "0") public Double factQty; - @Column(name = "PASS_QTY") + @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "合格数量", example = "0") public Double passQty; - @Column(name = "REJECT_QTY") + @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") public Double rejectQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index 27f4a5a..f740e9c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -44,7 +44,7 @@ public class WmsShipping extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 041887f..de87da0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -46,7 +46,7 @@ public class WmsSnOperateRecord extends BaseBean { @ApiParam(value = "库位代码") private String locateNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "数量", example = "0") private Double qty = 0d; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java index 5fa795e..d48a771 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java @@ -61,7 +61,7 @@ public class WmsSnPrintRcd extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java index a26d449..001b0a6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java @@ -60,12 +60,12 @@ public class WmsStockInitialize extends BaseBean { @AnnoOutputColumn private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "可用数量", example = "0") @AnnoOutputColumn private Double qty = 0d; - @Column(name = "SNP") + @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam(value = "标准包装", example = "1") @AnnoOutputColumn private Double snp; 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 ffa452e..7ae45fb 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 @@ -79,47 +79,47 @@ public class WmsStockQuan extends BaseBean { private WmsLocate wmsLocate; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "FAIL_QTY") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; - @Column(name = "HOLD_QTY") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; - @Column(name = "QC_QTY") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; - @Column(name = "RIN_QTY") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; - @Column(name = "FREEZE_QTY") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; - @Column(name = "CONSIGN_QTY") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; - @Column(name = "LOCK_QTY") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") private Double scrapQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 37201b2..8ccbb2b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -109,7 +109,7 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "数量", example = "0") private Double qty = 0d; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index 0a7ff59..d19ee0c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -64,12 +64,12 @@ public class WmsTaskDetails extends BaseBean { @ApiParam(value = "供应商编号") private String vendorNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "1") private Double qty; - @Column(name = "TRANS_QTY") + @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "处理数量", example = "1") private Double transQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index 5812f39..674df38 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -58,7 +58,7 @@ public class WmsTrans extends BaseBean{ @ApiParam(value ="交易状态",example = "1") private Integer transStatus; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value ="需求数") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index a7d96c8..d5e6146 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -98,47 +98,47 @@ public class WmsTransQuan extends BaseBean { @ApiParam(value = "错误信息") private String errorMessage; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "FAIL_QTY") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; - @Column(name = "HOLD_QTY") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; - @Column(name = "QC_QTY") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; - @Column(name = "RIN_QTY") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; - @Column(name = "FREEZE_QTY") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; - @Column(name = "CONSIGN_QTY") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; - @Column(name = "LOCK_QTY") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") private Double scrapQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index 45d366a..1e47d2e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -58,7 +58,7 @@ public class WmsTransRcd extends BaseBean{ @ApiParam(value ="交易状态",example = "1") private Integer transStatus; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value ="需求数") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java index 7e066dd..447bdf9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java @@ -66,12 +66,12 @@ public class WmsTransSn extends BaseBean { @ApiParam("事务代码") public String transCode; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "交易数量", example = "0") public Double qty; - @Column(name="REJECT_QTY") + @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "不合格交易数量", example = "0") public Double rejectQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java index 30bc5e6..03e877d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java @@ -37,7 +37,7 @@ public class WmsUnitConvert extends BaseBean { @ApiParam(value = "目标单位") private String destUnitCode; - @Column(name = "UNIT_COEFFICIENT") + @Column(name = "UNIT_COEFFICIENT", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率") private Double unitCoefficient; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java index 01b8aa1..40fdf34 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java @@ -63,7 +63,7 @@ public class WmsMoveDetailsSnapshot extends BaseBean { @ApiParam("客户编号") public String custNo; - @Column(name="TRANS_QTY") + @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "处理数量", example = "0") public Double transQty; @@ -71,7 +71,7 @@ public class WmsMoveDetailsSnapshot extends BaseBean { return this.transQty == null ? 0 : this.transQty.doubleValue(); } - @Column(name="REJECT_QTY") + @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "不合格处理数量", example = "0") public Double rejectQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java index 6f781aa..453d372 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java @@ -89,7 +89,7 @@ public class WmsMoveSnSnapshot extends BaseBean { @ApiParam("容器编号") public String packAgeNo; - @Column(name = "SRC_QTY") + @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "源数量", example = "0") public Double srcQty; @@ -126,12 +126,12 @@ public class WmsMoveSnSnapshot extends BaseBean { @Transient private Long finishedCounts; - @Column(name = "DEST_QTY") + @Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "目标数量", example = "0") public Double destQty; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java index f7e6aac..7b9e473 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java @@ -87,47 +87,47 @@ public class WmsStockQuanSnapshot extends BaseBean { private WmsLocate wmsLocate; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "FAIL_QTY") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; - @Column(name = "HOLD_QTY") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; - @Column(name = "QC_QTY") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; - @Column(name = "RIN_QTY") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; - @Column(name = "FREEZE_QTY") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; - @Column(name = "CONSIGN_QTY") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; - @Column(name = "LOCK_QTY") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") private Double scrapQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java index 436d126..b13c8f0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java @@ -116,7 +116,7 @@ public class WmsStockSnSnapshot extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "数量", example = "0") private Double qty = 0d; 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 d4e7e0c..ed8a060 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 @@ -1533,19 +1533,13 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + DdlPreparedPack.getNumNOEqualPack(wmsStockSn.getPrinted(), "printed", result); DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result); result.setOrderByStr(wmsStockSn.orderBy()); - if(wmsStockSn.getPrinted()!= null){ - if(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue() == wmsStockSn.getPrinted()){ - DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue(),"printed",result); - } - } - getStringBuilderPack(wmsStockSn, result); return result; } @@ -2279,7 +2273,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); //数量大于0 - DdlPreparedPack.getNumberBiggerPack(0, "qty", result); + DdlPreparedPack.getNumberBiggerPackContainsZero(0d, "qty", result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); @@ -2378,8 +2372,7 @@ public class WmsHqlPack { } - - /** + /** * 业务：库存查询封装 * * @param wmsStockQuan @@ -2388,23 +2381,23 @@ public class WmsHqlPack { public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) { DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result); DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); - // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result); + // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result); DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result); getStringBuilderPack(wmsRouting, result); return result; } - + public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) { DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result); DdlPreparedPack.getStringEqualPack(wmsRoutingRule.getRoutingCode(), "routingCode", result); - + DdlPreparedPack.getInPack(wmsRoutingRule.getIsValid(), "isValid", result); DdlPreparedPack.getInPack(wmsRoutingRule.getIsDeleted(), "isDeleted", result); getStringBuilderPack(wmsRoutingRule, result);