From 8a69224e05ca8be79fa80dd8a32ddf7178012982 Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 23 Apr 2019 18:28:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=92=8C=E8=B4=A8=E6=A3=80=E6=98=8E=E7=BB=86=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 10 +++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 24 +++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) 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 384b1bb..1082439 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 @@ -242,6 +242,16 @@ public class DdlPreparedPack { * @param columnName 列名 * @param packBean */ + public static void getStringNotNullPack(String columnName, DdlPackBean packBean) { + packBean.addColumnQuery(null," and model." + columnName + " is not null", null); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ 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); 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 b6a45ce..12cca86 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 @@ -1021,13 +1021,35 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); - + HqlPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result); getStringBuilderPack(wmsMoveSn, result); return result.toString(); } /** + * 针对质检查询库存移动条码条件封装 + * @param sn + * @return + */ + public static DdlPackBean packHqlWmsMoveSnForQC(List orderList, String sn, String organizeCode) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(sn, "sn", result); + DdlPreparedPack.getInPackList(orderList, "orderNo", result); + DdlPreparedPack.getStringNotNullPack("remark", result); + + // 判断工厂代码是否为空 + if (StringUtils.isNotBlank(organizeCode)) { + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result); + } + + // 封装有效状态和删除状态 + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return result; + } + + /** * 质检单信息 查询条件封装 * * @param wmsQCMaster From 9ec20ed314cd26a00a3b744fcf9fb4c483b90cb3 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Tue, 23 Apr 2019 20:14:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=8F=91=E5=B8=83=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java | 5 +++++ .../i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java | 8 ++++++++ .../pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index 3c8883e..d54f472 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : @@ -178,4 +179,8 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Column(name = "REF_NO") @ApiParam(value = "合同号") private String refNo; + + @Transient + @ApiParam(value = "关联单号") + private String refOrderNo; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java index 95ad16e..3f5d66b 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java @@ -1,10 +1,12 @@ package cn.estsh.i3plus.pojo.sweb.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrder; import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; +import java.util.Map; /** * @Description : 订单批量新增输入模型 @@ -34,6 +36,12 @@ public class SwebPOBatchInsertEnterModel extends BaseBean { @ApiParam(value = "合同号") private String refNo; + @ApiParam(value = "是否导入使用") + private boolean isImport; + + @ApiParam(value = "订单主表对应日期缓存") + private Map dayOrderCache; + @ApiParam(value = "零件列表") private List partItems; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java index d6df41b..780d3be 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java @@ -34,6 +34,10 @@ public class SwebPOForPubListResultItemModel extends BaseBean { @Column(name = "VENDOR_NAME") private String vendorName; + @Column(name = "REF_NO") + @ApiParam(value = "合同号") + private String refNo; + @Column(name = "PART_NAME") @ApiParam(value = "零件名称") private String partName; From 6396fb1a385b8bded5074234833def0602994c17 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 23 Apr 2019 20:37:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E2=80=9CsnControl=E2=80=9D=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) 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 12cca86..7769d40 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 @@ -241,6 +241,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); + HqlPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); getStringBuilderPack(wmsPart, result); @@ -1029,6 +1030,7 @@ public class WmsHqlPack { /** * 针对质检查询库存移动条码条件封装 + * * @param sn * @return */ From 6204ff8538ab800706114c98d054b1649dfc7f63 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 24 Apr 2019 14:37:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?#3961+MASTER=5FORDER=5FNO=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0Code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) 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 dd4ba2e..389d72a 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 @@ -139,17 +139,19 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MASTER_ORDER_STATUS { - CREATE(10, "新建"), - RECEIPT(20, "处理中"), - RECEIPT_FINISH(30, "已完成"), - CLOSED(40, "已关闭"), - CANCELLED(50, "已取消"); + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "处理中"), + RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), + CLOSED(40, "CLOSED", "已关闭"), + CANCELLED(50, "CANCELLED", "已取消"); private int value; + private String code; private String description; - MASTER_ORDER_STATUS(int value, String description) { + MASTER_ORDER_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -161,6 +163,10 @@ public class WmsEnumUtil { return description; } + public String getCode() { + return code; + } + public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { From ee33834f9a4b629ea39f7a711fcede3fe0984eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 24 Apr 2019 15:27:54 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 12cca86..4f2c0c6 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 @@ -1028,7 +1028,7 @@ public class WmsHqlPack { } /** - * 针对质检查询库存移动条码条件封装 + * 针对质检查询库存移动条码条件封装(特殊处理) * @param sn * @return */