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 341490d..0205650 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 @@ -624,6 +624,25 @@ public class DdlPreparedPack { } } + + /** + * 封装not in List查询语句 + * + * @param data + * @param columnName + * @param sufColumnName + * @param packBean + */ + public static void getNotInPackList(List data, String columnName, String sufColumnName, DdlPackBean packBean) { + if (data != null && data.size() > 0) { + String destColumnName = columnName; + if (!StringUtil.isEmpty(sufColumnName)) { + destColumnName = destColumnName + "_" + System.currentTimeMillis(); + } + packBean.addColumnQuery(destColumnName, " and model." + columnName + " not in (:m_" + destColumnName + ")", data); + } + } + /** * 封装in String查询语句 * diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java index accc6b4..5807d18 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java @@ -63,7 +63,11 @@ public class SwebRequireAlarm extends BaseBean { @Column(name = "COUNT_DATE") @ApiParam("日期") - private Double countDate; + private String countDate; + + @Column(name = "REQUEST_QTY") + @ApiParam("需求数量") + private String requestQty; @Transient @ApiParam("日期") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 01fecb2..7cd233a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -251,7 +251,7 @@ public class WmsDocMovementMaster extends BaseBean { /**备注3**/ @Column(name = "THIRD_REMAKE") - @ApiParam(value = "客户类型") + @ApiParam(value = "财务类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_REMARK_PERSON", listColumnName = "name", explicitColumnName = "dictionaryValue") private String thirdRemake; 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 541097e..0634370 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 @@ -228,7 +228,7 @@ public class WmsHqlPack { for (String busiType : wmsDocMovementMaster.getFilterBusiType().split(",")) { filterBusiType.add(Integer.parseInt(busiType)); } - DdlPreparedPack.getNotInPackList(filterBusiType, "busiType", packBean); + DdlPreparedPack.getNotInPackList(filterBusiType, "busiType", System.currentTimeMillis() + "", packBean); } DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);