From 653c8dca1f96f19fb3cc9d5b339bb92072034c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 8 Oct 2019 21:42:12 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E7=9B=B4=E9=80=81=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=89=A3=E5=87=8FJOB=E8=BF=87=E6=BB=A4=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E7=BA=BF=E8=BE=B9=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E6=9D=A1=E7=A0=81=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) 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 b6cafeb..9789500 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; } From 0fa1ffa23b009535522db781bc3e80169797353b Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Wed, 9 Oct 2019 09:17:54 +0800 Subject: [PATCH 02/13] =?UTF-8?q?[=E7=89=A9=E6=B5=81=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java index 0b9f58c..af87b92 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java @@ -53,10 +53,18 @@ public class WmsRouting extends BaseBean { @Column(name = "FOR_PRODUCT") @ApiParam(value = "适用产品") + + private Integer forProduct; - + @Transient + @ApiParam(value = "补货规则列表") + List replenishList; + @Transient + @ApiParam(value = "推动规则列表补") + List promotionList; - public WmsRouting(){} + public WmsRouting() { + } } From 4ac7bae38bc3530ea1e43697847935de0467a40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 9 Oct 2019 09:18:05 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=96=B0=E5=A2=9Ehql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++++++++++++++++ 1 file changed, 17 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 b6cafeb..6dc696d 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 @@ -2408,4 +2408,21 @@ public class WmsHqlPack { return result; } + + /** + * 接口映射分页查询条件 + * + * @param wmsPrinterConfigure + * @return + */ + public static DdlPackBean packHqlWmsPrinterConfigure(WmsPrinterConfigure wmsPrinterConfigure) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsPrinterConfigure.getIp(), "ip", result); + DdlPreparedPack.getStringLikerPack(wmsPrinterConfigure.getPrinterNo(), "printerNo", result); + + getStringBuilderPack(wmsPrinterConfigure, result); + + return result; + } } From 4eada1c3430971e9f4e701225b2751e325820510 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 9 Oct 2019 10:53:37 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E8=A1=A8=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java | 4 ++++ 1 file changed, 4 insertions(+) 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; From 95f156adf4a9420396d0f2e9254c16a04a65ab24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 9 Oct 2019 11:00:30 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E6=89=80=E6=9C=89double=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E5=B1=9E=E6=80=A7=E9=83=BD=E8=A6=81=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E7=B2=BE=E5=BA=A6=E6=B3=A8=E8=A7=A3=EF=BC=8C=E5=90=A6?= =?UTF-8?q?=E5=88=99=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E7=B1=BB=E5=9E=8B=E4=B8=BAdouble?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 2 +- .../i3plus/pojo/wms/bean/AmpStockCurrent.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java | 4 +- .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 4 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 4 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 4 +- .../i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- .../i3plus/pojo/wms/bean/WmsCheckFactRecord.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 4 +- .../pojo/wms/bean/WmsDocMovementDetails.java | 12 ++-- .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsFGInStock.java | 2 +- .../i3plus/pojo/wms/bean/WmsLineLocatePart.java | 6 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 6 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 77 +++++++++++----------- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 6 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 6 +- .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 12 ++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java | 4 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 10 +-- .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 8 +-- .../cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java | 2 +- .../i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java | 2 +- .../i3plus/pojo/wms/bean/WmsStockInitialize.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 18 ++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 4 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 18 ++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java | 2 +- .../wms/bean/snapshot/WmsMoveDetailsSnapshot.java | 4 +- .../pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java | 6 +- .../wms/bean/snapshot/WmsStockQuanSnapshot.java | 18 ++--- .../pojo/wms/bean/snapshot/WmsStockSnSnapshot.java | 2 +- 40 files changed, 143 insertions(+), 142 deletions(-) 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 5639a23..8cd1f53 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 @@ -44,7 +44,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; From 68b0058e1b5b5e97fab83a81ec03662eaf90662d Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Wed, 9 Oct 2019 11:35:50 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) 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"), From 84a96a22fa3572c8c7b85232b46d9192a0b04afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 9 Oct 2019 12:01:28 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=96=B0=E5=8A=A0NotNumBiggerPackContain?= =?UTF-8?q?sZero=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 126 ++++++++++++--------- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 ++- 2 files changed, 78 insertions(+), 63 deletions(-) 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-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 4ede912..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 @@ -2273,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); @@ -2372,8 +2372,7 @@ public class WmsHqlPack { } - - /** + /** * 业务：库存查询封装 * * @param wmsStockQuan @@ -2382,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); From ddd91f51b595d04296f5947cead6e8f8e91f7253 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 9 Oct 2019 14:26:19 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E3=80=90=E7=94=9F=E4=BA=A7=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E5=85=A5=E5=BA=93=E3=80=91=E7=BB=84=E4=BB=B6=E9=80=89?= =?UTF-8?q?=E6=8B=A9=EF=BC=8C=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B71051?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java index b31d80a..1d29b77 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -46,6 +48,7 @@ public class WmsPartRelation extends BaseBean { @Column(name = "ASSOCIATE_TYPE") @ApiParam(value = "关联类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ASSOCIATE_TYPE.class, refForeignKey = "value", value = "description") private Integer associateType; } 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 5639a23..041887f 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -70,6 +72,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam(value = "操作类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description") private Integer operateType; } From bd55a18bf6b4b52cf24e92a1d8f54fac5d17559b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 9 Oct 2019 14:27:10 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20-=20=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/bean/BaseConstWords.java | 2 + .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 2 +- .../model/platform/LabelTemplatePagerModel.java | 23 ++++++++++++ .../pojo/platform/bean/SysLabelTemplate.java | 18 +++++++-- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 43 +++++++++++++++++----- 5 files changed, 74 insertions(+), 14 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplatePagerModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java index f5011e7..560b296 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java @@ -30,4 +30,6 @@ public class BaseConstWords { public static final String DICTIONARY_EMPLOYEE_TYPE ="EMPLOYEE_TYPE"; // 系统参数配置 PROPERTIES public static final String DICTIONARY_PROPERTIES ="PROPERTIES"; + // 打印模板分组 + public static final String DICTIONARY_LABEL_TEMPLATE_GROUP ="LABEL_TEMPLATE_GROUP"; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 67009bb..561ce58 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1161,7 +1161,7 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DICTIONARY_GROUP { SYSTEM(1, "系统字典"), - EXTERNAL(2, "外部人员"); + EXTERNAL(2, "业务字典"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplatePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplatePagerModel.java new file mode 100644 index 0000000..7234ef7 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplatePagerModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; +import lombok.Data; +import java.io.Serializable; + +/** + * @Description : 打印模板封装model + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-10-09 14:15 + * @Modify: + **/ +@Data +public class LabelTemplatePagerModel implements Serializable { + + private static final long serialVersionUID = 8331125246534692455L; + + private SysLabelTemplate labelTemplate; + + private Pager pager; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index 63e0250..f52be12 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -7,9 +7,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; - -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -37,6 +39,16 @@ public class SysLabelTemplate extends BaseBean { @ApiParam(value ="模板名称") private String templateName; + //枚举 CommonEnumUtil.SOFT_TYPE + @Column(name="TEMPLATE_SOFT_TYPE") + @ApiParam(value ="模板所属模块") + private Integer templateSoftType; + + //枚举 CommonEnumUtil.SOFT_TYPE + @Column(name="TEMPLATE_GROUP_ID") + @ApiParam(value ="模板分组") + private Integer templateGroupId; + @Lob @Column(name="TEMPLATE_CONTENT") @ApiParam(value ="模板内容") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 4beffc1..572f63f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -4,11 +4,32 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.platform.bean.*; +import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule; +import cn.estsh.i3plus.pojo.platform.bean.SysConfig; +import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; +import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; +import cn.estsh.i3plus.pojo.platform.bean.SysFile; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam; +import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; +import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; +import cn.estsh.i3plus.pojo.platform.bean.SysMenu; +import cn.estsh.i3plus.pojo.platform.bean.SysMessage; +import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; +import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; +import cn.estsh.i3plus.pojo.platform.bean.SysPosition; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole; +import cn.estsh.i3plus.pojo.platform.bean.SysRole; +import cn.estsh.i3plus.pojo.platform.bean.SysTask; +import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle; +import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan; +import cn.estsh.i3plus.pojo.platform.bean.SysTool; +import cn.estsh.i3plus.pojo.platform.bean.SysToolType; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; import org.apache.commons.lang3.StringUtils; - -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -849,17 +870,19 @@ public class CoreHqlPack { * @param sysLabelTemplate * @return */ - public static String packHqlSysLabelTemplate(SysLabelTemplate sysLabelTemplate) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysLabelTemplate(SysLabelTemplate sysLabelTemplate) { + DdlPackBean ddlPackBean = new DdlPackBean(); // hql拼接 - HqlPack.getStringLikerPack(sysLabelTemplate.getTemplateName(),"templateName",result); - HqlPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",result); + DdlPreparedPack.getStringLikerPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateGroupId(), "templateGroupId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateSoftType(), "templateSoftType", ddlPackBean); // 添加默认排序 - HqlPack.getOrderDefault(sysLabelTemplate); + ddlPackBean.setOrderByStr(sysLabelTemplate.orderBy()); - return result.toString(); + return ddlPackBean; } public static DdlPackBean packBeanSysLabelTemplate(SysLabelTemplate sysLabelTemplate) { From de685a06279308a91afe0b0a71cb7f88f1da16c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 9 Oct 2019 18:51:22 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E5=88=A0=E9=99=A4pojo=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java | 2 +- .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 8289035..0e39670 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -65,5 +65,5 @@ public class SysLocaleResource extends BaseBean { //系统自带需要有初始化表，只能修改value，无法删除。 @Column(name="is_system") @ApiParam(value = "是否系统参数",example = "2") - private Integer isSystem = 2; + private Integer isSystem; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java index 3f0cee2..fc7c6fc 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java @@ -69,6 +69,10 @@ public class BsSuitSchedule extends BaseBean { @ApiParam(value = "任务周期表达式表达式") private String taskCycleExecuteRdd; + @Column(name = "SUIT_PARAM") + @ApiParam(value = "适配参数") + private String suitParam; + @Column(name = "LAST_EXECUTE_DATE_TIME") @ApiParam(value = "最后一次执行时间") private String lastExecuteDateTime; From 320c7f6b1f3da794fdf5a032eab6277abccf5108 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 9 Oct 2019 19:45:05 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E3=80=90=E7=94=9F=E4=BA=A7=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E5=85=A5=E5=BA=93=E3=80=91=E7=94=9F=E4=BA=A7=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E5=85=A5=E5=BA=93=E5=AF=BC=E5=85=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java index 9122049..f6db3d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java @@ -56,5 +56,9 @@ public class WmsProductReturnMovement implements Serializable{ @AnnoOutputColumn private String planTime; + @ApiParam("移动类型") + @AnnoOutputColumn + public Integer moveType; + } From f67e7df17f83f14b927f046a346ba3e8772bb6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 9 Oct 2019 19:48:52 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=97=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 12 ++++++++++++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 20 +++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) 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..4aa554a 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 @@ -244,6 +244,18 @@ public class WmsStockSn extends BaseBean { private String snapshotTime; @Transient + @ApiParam(value = "模板编号") + private String templateNo; + + @Transient + @ApiParam(value = "客户物料号") + private String customerPartNo; + + @Transient + @ApiParam(value = "箱号") + private String boxNo; + + @Transient private Integer isSnapshot; public WmsStockSn() { 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..144ab5c 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 @@ -2433,7 +2433,7 @@ public class WmsHqlPack { } /** - * 接口映射分页查询条件 + * 打印机管理信息分页查询条件 * * @param wmsPrinterConfigure * @return @@ -2448,4 +2448,22 @@ public class WmsHqlPack { return result; } + + /** + * 待打印队列信息分页查询条件 + * + * @param wmsPrintingQueue + * @return + */ + public static DdlPackBean packHqlwmsPrintingQueueByPrintNo(WmsPrintingQueue wmsPrintingQueue) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsPrintingQueue.getPrintNo(), "printNo", result); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result); + + getStringBuilderPack(wmsPrintingQueue, result); + + return result; + } } From ddfb47e6acdca93448853c362f30cc4a0a303ccb Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 9 Oct 2019 21:39:08 +0800 Subject: [PATCH 13/13] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 150 +++++++++++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java | 4 +- .../i3plus/pojo/mes/pcn/bean/MesEquipment.java | 40 +++- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 4 +- .../i3plus/pojo/mes/pcn/bean/MesWcEquipment.java | 4 +- .../java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java | 4 +- .../estsh/i3plus/pojo/mes/bean/MesEquipment.java | 54 ++++- .../estsh/i3plus/pojo/mes/bean/MesWcEquipment.java | 4 +- .../i3plus/pojo/mes/model/MesEquipmentModel.java | 48 +++++ .../mes/repository/MesWcEquipmentRepository.java | 16 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 239 ++++++++++----------- 11 files changed, 408 insertions(+), 159 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcEquipmentRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index c73775b..d48d08c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,156 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes设备类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQUIPMENT_TYPE { + + PHYSICAL(10, "物理设备"), + LOGIC(20, "逻辑设备"); + + private int value; + private String description; + + MES_EQUIPMENT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * mes设备连接类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQUIPMENT_CONNECT_TYPE { + + PLC(10, "PLC"), + DB(20, "DB"), + OTHER(30, "其他"); + + private int value; + private String description; + + MES_EQUIPMENT_CONNECT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * mes设备状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQUIPMENT_STATUS { + + INUSE(10, "在用"), + SPARE(20, "备用"), + FAULT(30, "故障"), + SERVICE(40, "检修"), + STOPUSING(50, "停用"); + + private int value; + private String description; + + MES_EQUIPMENT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * mes设备类别 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQUIPMENT_CATEGORY { + + A("A", "A"), + B("B", "B"), + C("C", "C"), + D("D", "D"); + + private String value; + private String description; + + MES_EQUIPMENT_CATEGORY(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * mes按钮状态配置 判断符号 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java index e86de81..113151d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java @@ -55,8 +55,8 @@ public class MesDb extends BaseBean { @ApiParam("密码") private String dsPassword; - @Column(name="EQU_CODE") + @Column(name="EQUIPMENT_CODE") @ApiParam("设备代码") - private String equCode; + private String equipmentCode; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java index e6dd7ba..b41bde8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java @@ -41,19 +41,39 @@ public class MesEquipment extends BaseBean { @Column(name="STATUS") @ApiParam("设备状态") - private String status; + private Integer status; - @Column(name="WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; + @Column(name="EQUIPMENT_TYPE") + @ApiParam("设备类型") + private Integer equipmentType; - @Column(name="WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; + @Column(name="EQUIPMENT_CATEGORY") + @ApiParam("设备类别") + private String equipmentCategory; - @Column(name="AREA_CODE") - @ApiParam("区域代码") - private String areaCode; + @Column(name="EQUIPMENT_MODEL") + @ApiParam("型号") + private String equipmentModel; + + @Column(name="EQUIPMENT_SPEC") + @ApiParam("规格") + private String equipmentSpec; + + @Column(name="EQUIPMENT_MAKER") + @ApiParam("制造商") + private String equipmentMaker; + + @Column(name="RELEASE_DATE") + @ApiParam("出厂日期") + private String releaseDate; + + @Column(name="RECEIVE_DATE") + @ApiParam("接收日期") + private String receiveDate; + + @Column(name="ENABLE_DATE") + @ApiParam("启用日期") + private String enableDate; @Column(name="CONNECT_TYPE") @ApiParam("连接类型") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index f25e3b5..756aea5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -63,9 +63,9 @@ public class MesPlc extends BaseBean { @ApiParam("分组名称") private String groupName; - @Column(name = "EQU_CODE") + @Column(name="EQUIPMENT_CODE") @ApiParam("设备代码") - private String equCode; + private String equipmentCode; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java index 11e5acd..e86a851 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java @@ -34,8 +34,8 @@ public class MesWcEquipment extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; - @Column(name="EQU_CODE") + @Column(name="EQUIPMENT_CODE") @ApiParam("设备代码") - private String equCode; + private String equipmentCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java index de939b5..3f9c070 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java @@ -55,8 +55,8 @@ public class MesDb extends BaseBean { @ApiParam("密码") private String dsPassword; - @Column(name = "EQU_CODE") + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") - private String equCode; + private String equipmentCode; } 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 069b395..f7f03b2 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 @@ -17,7 +17,7 @@ import javax.persistence.Table; import javax.persistence.Transient; /** - * @Description :生产区域 + * @Description :生产设备 * @Reference : * @Author : jack.jia * @CreateDate : 2019-04-02 @@ -41,19 +41,39 @@ public class MesEquipment extends BaseBean { @Column(name="STATUS") @ApiParam("设备状态") - private String status; + private Integer status; - @Column(name="WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; + @Column(name="EQUIPMENT_TYPE") + @ApiParam("设备类型") + private Integer equipmentType; - @Column(name="WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; + @Column(name="EQUIPMENT_CATEGORY") + @ApiParam("设备类别") + private String equipmentCategory; - @Column(name="AREA_CODE") - @ApiParam("区域代码") - private String areaCode; + @Column(name="EQUIPMENT_MODEL") + @ApiParam("型号") + private String equipmentModel; + + @Column(name="EQUIPMENT_SPEC") + @ApiParam("规格") + private String equipmentSpec; + + @Column(name="EQUIPMENT_MAKER") + @ApiParam("制造商") + private String equipmentMaker; + + @Column(name="RELEASE_DATE") + @ApiParam("出厂日期") + private String releaseDate; + + @Column(name="RECEIVE_DATE") + @ApiParam("接收日期") + private String receiveDate; + + @Column(name="ENABLE_DATE") + @ApiParam("启用日期") + private String enableDate; @Column(name="CONNECT_TYPE") @ApiParam("连接类型") @@ -63,6 +83,18 @@ public class MesEquipment extends BaseBean { @ApiParam(value ="名称") private String name; + @Transient + @ApiParam(value ="生产线") + private String workCenterCode; + + @Transient + @ApiParam(value ="工位") + private String workCellCode; + + @Transient + @ApiParam(value ="区域") + private String areaCode; + // 默认值 -1 @Transient @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java index d79594c..1a228bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java @@ -35,8 +35,8 @@ public class MesWcEquipment extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; - @Column(name="EQU_CODE") + @Column(name="EQUIPMENT_CODE") @ApiParam("设备代码") - private String equCode; + private String equipmentCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java new file mode 100644 index 0000000..26675c1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesEquipmentModel implements Serializable { + @ApiParam(value ="id") + private Long id; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam("设备状态") + private Integer status; + + @ApiParam(value ="生产线") + private String workCenterCode; + + @ApiParam(value ="工位") + private String workCellCode; + + @ApiParam(value ="区域") + private String areaCode; + + @ApiParam(value ="设备工位关联ID") + private Long wcId; + + public MesEquipmentModel() { + + } + + public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) { + this.wcId = wcId; + this.id = id; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.status = status; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.areaCode = areaCode; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcEquipmentRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcEquipmentRepository.java new file mode 100644 index 0000000..1186132 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcEquipmentRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWcEquipment; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-09 + * @Modify: + **/ +@Repository +public interface MesWcEquipmentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index be9bc53..7d31328 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -6,7 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.*; -import org.apache.commons.lang3.StringUtils; +import org.springframework.util.StringUtils; /** * @Description: @@ -32,16 +32,16 @@ public class MesHqlPack { public static DdlPackBean getMesPcnByCondition(MesPcn mesPcn, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesPcn.getConnectIp())) { + if (!StringUtils.isEmpty(mesPcn.getConnectIp())) { DdlPreparedPack.getStringLikerPack(mesPcn.getConnectIp(), "connectIp", packBean); } - if (StringUtils.isNotEmpty(mesPcn.getPcnName())) { + if (!StringUtils.isEmpty(mesPcn.getPcnName())) { DdlPreparedPack.getStringLikerPack(mesPcn.getPcnName(), "pcnName", packBean); } - if (StringUtils.isNotEmpty(mesPcn.getPcnCode())) { + if (!StringUtils.isEmpty(mesPcn.getPcnCode())) { DdlPreparedPack.getStringLikerPack(mesPcn.getPcnCode(), "pcnCode", packBean); } - if (StringUtils.isNotEmpty(mesPcn.getAreaCode())) { + if (!StringUtils.isEmpty(mesPcn.getAreaCode())) { DdlPreparedPack.getStringLikerPack(mesPcn.getAreaCode(), "areaCode", packBean); } if (mesPcn.getIsValid() != null) { @@ -62,23 +62,23 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); - if (StringUtils.isNotEmpty(mesPlanOrder.getOrderNo())) { + if (!StringUtils.isEmpty(mesPlanOrder.getOrderNo())) { DdlPreparedPack.getStringLikerPack(mesPlanOrder.getOrderNo(), "orderNo", packBean); } - if (StringUtils.isNotEmpty(mesPlanOrder.getPartNo())) { + if (!StringUtils.isEmpty(mesPlanOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesPlanOrder.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "") && mesPlanOrder.getPlanTypeVal() != 0) { + if (!StringUtils.isEmpty(mesPlanOrder.getPlanType() + "") && mesPlanOrder.getPlanTypeVal() != 0) { DdlPreparedPack.getNumEqualPack(mesPlanOrder.getPlanType(), "planType", packBean); } - if (StringUtils.isNotEmpty(mesPlanOrder.getStatus() + "") && mesPlanOrder.getStatusVal() != 0) { + if (!StringUtils.isEmpty(mesPlanOrder.getStatus() + "") && mesPlanOrder.getStatusVal() != 0) { DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatus(), "status", packBean); } - if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) { + if (!StringUtils.isEmpty(mesPlanOrder.getCreateUser())) { DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean); } - if (StringUtils.isNotEmpty(mesPlanOrder.getCustOrderNo())) { + if (!StringUtils.isEmpty(mesPlanOrder.getCustOrderNo())) { DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCustOrderNo(), "custOrderNo", packBean); } @@ -114,19 +114,19 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); - if (StringUtils.isNotEmpty(mesPart.getPartNo())) { + if (!StringUtils.isEmpty(mesPart.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(mesPart.getPartName())) { + if (!StringUtils.isEmpty(mesPart.getPartName())) { DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean); } - if (StringUtils.isNotEmpty(mesPart.getCategoryCode1())) { + if (!StringUtils.isEmpty(mesPart.getCategoryCode1())) { DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean); } - if (StringUtils.isNotEmpty(mesPart.getCategoryCode2())) { + if (!StringUtils.isEmpty(mesPart.getCategoryCode2())) { DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean); } - if (StringUtils.isNotEmpty(mesPart.getCategoryCode3())) { + if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) { DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); } @@ -143,31 +143,31 @@ public class MesHqlPack { */ public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesWorkOrder.getOrderNo())) { + if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getPartNo())) { + if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) { + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) { + if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); } if (mesWorkOrder.getApprovalStatus() != null) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getCustOrderNo())) { + if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) { + if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getCreateUser())) { + if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean); } if (mesWorkOrder.getIsValid() != null) { @@ -200,15 +200,15 @@ public class MesHqlPack { */ public static DdlPackBean getQueueOrder(MesQueueOrder mesQueueOrder, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoStart())) { + if (!StringUtils.isEmpty(mesQueueOrder.getCustFlagNoStart())) { DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustFlagNoStart(), "custFlagNo", packBean); } - if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) { + if (!StringUtils.isEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) { DdlPreparedPack.getStringSmallerPack(mesQueueOrder.getCustFlagNoEnd(), "custFlagNo", packBean); } - if (StringUtils.isNotEmpty(mesQueueOrder.getOrderNo() + "")) { + if (!StringUtils.isEmpty(mesQueueOrder.getOrderNo() + "")) { DdlPreparedPack.getStringLikerPack(mesQueueOrder.getOrderNo(), "orderNo", packBean); } @@ -253,7 +253,7 @@ public class MesHqlPack { */ public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode); - if (StringUtils.isNotEmpty(mesArea.getAreaCode())) { + if (!StringUtils.isEmpty(mesArea.getAreaCode())) { DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean); } @@ -281,13 +281,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode); - if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) { + if (!StringUtils.isEmpty(mesWorkCell.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); } - if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())) { + if (!StringUtils.isEmpty(mesWorkCell.getAreaCode())) { DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); } - if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())) { + if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); } @@ -295,24 +295,6 @@ public class MesHqlPack { } /** - * MES设备信息查询条件封装 - * - * @param mesEquipment - * @return - */ - public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode); - if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())) { - DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean); - } - if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())) { - DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean); - } - - return packBean; - } - - /** * 流程查询条件封装 * * @param mesRoute @@ -350,13 +332,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesShift(MesShift shift, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode); - if (StringUtils.isNotEmpty(shift.getShiftCode())) { + if (!StringUtils.isEmpty(shift.getShiftCode())) { DdlPreparedPack.getStringLikerPack(shift.getShiftCode(), "shiftCode", packBean); } - if (StringUtils.isNotEmpty(shift.getShiftName())) { + if (!StringUtils.isEmpty(shift.getShiftName())) { DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean); } - if (StringUtils.isNotEmpty(shift.getWorkCenterCode())) { + if (!StringUtils.isEmpty(shift.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean); } @@ -373,10 +355,10 @@ public class MesHqlPack { public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode); - if (StringUtils.isNotEmpty(shiftGroup.getGroupCode())) { + if (!StringUtils.isEmpty(shiftGroup.getGroupCode())) { DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean); } - if (StringUtils.isNotEmpty(shiftGroup.getGroupName())) { + if (!StringUtils.isEmpty(shiftGroup.getGroupName())) { DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean); } return packBean; @@ -390,10 +372,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesShiftRest(MesShiftRest shiftRest, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(shiftRest, organizeCode); - if (StringUtils.isNotEmpty(shiftRest.getWorkCenterCode())) { + if (!StringUtils.isEmpty(shiftRest.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(shiftRest.getWorkCenterCode(), "workCenterCode", packBean); } - if (StringUtils.isNotEmpty(shiftRest.getShiftCode())) { + if (!StringUtils.isEmpty(shiftRest.getShiftCode())) { DdlPreparedPack.getStringEqualPack(shiftRest.getShiftCode(), "shiftCode", packBean); } @@ -408,10 +390,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesScrap.getScrapCode())) { + if (!StringUtils.isEmpty(mesScrap.getScrapCode())) { DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean); } - if (StringUtils.isNotEmpty(mesScrap.getScrapName())) { + if (!StringUtils.isEmpty(mesScrap.getScrapName())) { DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean); } if (mesScrap.getIsValid() != null) { @@ -446,10 +428,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesConfig.getCfgCode())) { + if (!StringUtils.isEmpty(mesConfig.getCfgCode())) { DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); } - if (StringUtils.isNotEmpty(mesConfig.getCfgName())) { + if (!StringUtils.isEmpty(mesConfig.getCfgName())) { DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); } if (mesConfig.getIsValid() != null) { @@ -466,10 +448,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesRepair.getRepairCode())) { + if (!StringUtils.isEmpty(mesRepair.getRepairCode())) { DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean); } - if (StringUtils.isNotEmpty(mesRepair.getRepairName())) { + if (!StringUtils.isEmpty(mesRepair.getRepairName())) { DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); } if (mesRepair.getRepairType() != null) { @@ -503,10 +485,10 @@ public class MesHqlPack { public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode); - if (StringUtils.isNotEmpty(mesESOP.getWorkCenterCode())) { + if (!StringUtils.isEmpty(mesESOP.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean); } - if (StringUtils.isNotEmpty(mesESOP.getPartNo())) { + if (!StringUtils.isEmpty(mesESOP.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesESOP.getPartNo(), "partNo", packBean); } @@ -639,13 +621,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesEventAction(MesEventAction mesEventAction, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesEventAction, organizeCode); - if (StringUtils.isNotEmpty(mesEventAction.getOrganizeCode())) { + if (!StringUtils.isEmpty(mesEventAction.getOrganizeCode())) { DdlPreparedPack.getStringEqualPack(mesEventAction.getOrganizeCode(), "organizeCode", packBean); } - if (StringUtils.isNotEmpty(mesEventAction.getEventCode())) { + if (!StringUtils.isEmpty(mesEventAction.getEventCode())) { DdlPreparedPack.getStringLikerPack(mesEventAction.getEventCode(), "eventCode", packBean); } - if (StringUtils.isNotEmpty(mesEventAction.getActionCode())) { + if (!StringUtils.isEmpty(mesEventAction.getActionCode())) { DdlPreparedPack.getStringLikerPack(mesEventAction.getActionCode(), "actionCode", packBean); } @@ -661,10 +643,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesProcess(MesProcess process, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(process, organizeCode); - if (StringUtils.isNotEmpty(process.getProcessCode())) { + if (!StringUtils.isEmpty(process.getProcessCode())) { DdlPreparedPack.getStringLikerPack(process.getProcessCode(), "processCode", packBean); } - if (StringUtils.isNotEmpty(process.getProcessName())) { + if (!StringUtils.isEmpty(process.getProcessName())) { DdlPreparedPack.getStringLikerPack(process.getProcessName(), "processName", packBean); } @@ -679,13 +661,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesStep(MesStep step, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(step, organizeCode); - if (StringUtils.isNotEmpty(step.getStepCode())) { + if (!StringUtils.isEmpty(step.getStepCode())) { DdlPreparedPack.getStringLikerPack(step.getStepCode(), "stepCode", packBean); } - if (StringUtils.isNotEmpty(step.getStepName())) { + if (!StringUtils.isEmpty(step.getStepName())) { DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean); } - if (StringUtils.isNotEmpty(step.getStepType())) { + if (!StringUtils.isEmpty(step.getStepType())) { DdlPreparedPack.getStringLikerPack(step.getStepType(), "stepType", packBean); } @@ -700,13 +682,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesStepParam(MesStepParam stepParam, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(stepParam, organizeCode); - if (StringUtils.isNotEmpty(stepParam.getStepCode())) { + if (!StringUtils.isEmpty(stepParam.getStepCode())) { DdlPreparedPack.getStringEqualPack(stepParam.getStepCode(), "stepCode", packBean); } - if (StringUtils.isNotEmpty(stepParam.getParamCode())) { + if (!StringUtils.isEmpty(stepParam.getParamCode())) { DdlPreparedPack.getStringLikerPack(stepParam.getParamCode(), "paramCode", packBean); } - if (StringUtils.isNotEmpty(stepParam.getParamName())) { + if (!StringUtils.isEmpty(stepParam.getParamName())) { DdlPreparedPack.getStringLikerPack(stepParam.getParamName(), "paramName", packBean); } @@ -721,16 +703,16 @@ public class MesHqlPack { */ public static DdlPackBean getMesRouteProcessCell(MesRouteProcessCell routeProcessCell, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(routeProcessCell, organizeCode); - if (StringUtils.isNotEmpty(routeProcessCell.getRouteCode())) { + if (!StringUtils.isEmpty(routeProcessCell.getRouteCode())) { DdlPreparedPack.getStringEqualPack(routeProcessCell.getRouteCode(), "routeCode", packBean); } - if (StringUtils.isNotEmpty(routeProcessCell.getProcessCode())) { + if (!StringUtils.isEmpty(routeProcessCell.getProcessCode())) { DdlPreparedPack.getStringEqualPack(routeProcessCell.getProcessCode(), "processCode", packBean); } - if (StringUtils.isNotEmpty(routeProcessCell.getWorkCellCode())) { + if (!StringUtils.isEmpty(routeProcessCell.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCellCode(), "workCellCode", packBean); } - if (StringUtils.isNotEmpty(routeProcessCell.getWorkCenterCode())) { + if (!StringUtils.isEmpty(routeProcessCell.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCenterCode(), "workCenterCode", packBean); } @@ -745,13 +727,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesBom(MesBom bom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(bom, organizeCode); - if (StringUtils.isNotEmpty(bom.getPartNo())) { + if (!StringUtils.isEmpty(bom.getPartNo())) { DdlPreparedPack.getStringLikerPack(bom.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(bom.getItemPartNo())) { + if (!StringUtils.isEmpty(bom.getItemPartNo())) { DdlPreparedPack.getStringLikerPack(bom.getItemPartNo(), "itemPartNo", packBean); } - if (StringUtils.isNotEmpty(bom.getBomVersion())) { + if (!StringUtils.isEmpty(bom.getBomVersion())) { DdlPreparedPack.getStringLikerPack(bom.getBomVersion(), "bomVersion", packBean); } @@ -791,10 +773,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); - if (StringUtils.isNotEmpty(customer.getCustomerCode())) { + if (!StringUtils.isEmpty(customer.getCustomerCode())) { DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean); } - if (StringUtils.isNotEmpty(customer.getCustomerName())) { + if (!StringUtils.isEmpty(customer.getCustomerName())) { DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); } @@ -809,10 +791,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesCustProdLine(MesCustProdLine custProdLine, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(custProdLine, organizeCode); - if (StringUtils.isNotEmpty(custProdLine.getCustProdLineCode())) { + if (!StringUtils.isEmpty(custProdLine.getCustProdLineCode())) { DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean); } - if (StringUtils.isNotEmpty(custProdLine.getCustProdLineName())) { + if (!StringUtils.isEmpty(custProdLine.getCustProdLineName())) { DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineName(), "custProdLineName", packBean); } @@ -827,13 +809,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesCustomerPart(MesCustomerPart customerPart, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(customerPart, organizeCode); - if (StringUtils.isNotEmpty(customerPart.getCustomerCode())) { + if (!StringUtils.isEmpty(customerPart.getCustomerCode())) { DdlPreparedPack.getStringEqualPack(customerPart.getCustomerCode(), "customerCode", packBean); } - if (StringUtils.isNotEmpty(customerPart.getPartNo())) { + if (!StringUtils.isEmpty(customerPart.getPartNo())) { DdlPreparedPack.getStringLikerPack(customerPart.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(customerPart.getCustomerPartNo())) { + if (!StringUtils.isEmpty(customerPart.getCustomerPartNo())) { DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean); } @@ -874,10 +856,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesProdCfgType(MesProdCfgType prodCfgType, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgType, organizeCode); - if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())) { + if (!StringUtils.isEmpty(prodCfgType.getProdCfgTypeCode())) { DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); } - if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())) { + if (!StringUtils.isEmpty(prodCfgType.getProdCfgTypeName())) { DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean); } @@ -902,13 +884,13 @@ public class MesHqlPack { public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode); - if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())) { + if (!StringUtils.isEmpty(prodCfg.getProdCfgCode())) { DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean); } - if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())) { + if (!StringUtils.isEmpty(prodCfg.getProdCfgName())) { DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgName(), "prodCfgName", packBean); } - if (StringUtils.isNotEmpty(prodCfg.getProdCfgTypeCode())) { + if (!StringUtils.isEmpty(prodCfg.getProdCfgTypeCode())) { DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); } @@ -923,10 +905,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesProdCfgDetail(MesProdCfgDetail prodCfgDetail, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgDetail, organizeCode); - if (StringUtils.isNotEmpty(prodCfgDetail.getProdCfgCode())) { + if (!StringUtils.isEmpty(prodCfgDetail.getProdCfgCode())) { DdlPreparedPack.getStringEqualPack(prodCfgDetail.getProdCfgCode(), "prodCfgCode", packBean); } - if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())) { + if (!StringUtils.isEmpty(prodCfgDetail.getPartNo())) { DdlPreparedPack.getStringLikerPack(prodCfgDetail.getPartNo(), "partNo", packBean); } @@ -941,19 +923,19 @@ public class MesHqlPack { */ public static DdlPackBean getMesPart(MesPart part, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode); - if (StringUtils.isNotEmpty(part.getPartNo())) { + if (!StringUtils.isEmpty(part.getPartNo())) { DdlPreparedPack.getStringLikerPack(part.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(part.getPartName())) { + if (!StringUtils.isEmpty(part.getPartName())) { DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean); } - if (StringUtils.isNotEmpty(part.getCategoryCode1())) { + if (!StringUtils.isEmpty(part.getCategoryCode1())) { DdlPreparedPack.getStringEqualPack(part.getCategoryCode1(), "categoryCode1", packBean); } - if (StringUtils.isNotEmpty(part.getCategoryCode2())) { + if (!StringUtils.isEmpty(part.getCategoryCode2())) { DdlPreparedPack.getStringEqualPack(part.getCategoryCode2(), "categoryCode2", packBean); } - if (StringUtils.isNotEmpty(part.getCategoryCode3())) { + if (!StringUtils.isEmpty(part.getCategoryCode3())) { DdlPreparedPack.getStringEqualPack(part.getCategoryCode3(), "categoryCode3", packBean); } @@ -968,10 +950,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesPartCategory(MesPartCategory partCategory, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(partCategory, organizeCode); - if (StringUtils.isNotEmpty(partCategory.getCategoryCode())) { + if (!StringUtils.isEmpty(partCategory.getCategoryCode())) { DdlPreparedPack.getStringLikerPack(partCategory.getCategoryCode(), "categoryCode", packBean); } - if (StringUtils.isNotEmpty(partCategory.getCategoryName())) { + if (!StringUtils.isEmpty(partCategory.getCategoryName())) { DdlPreparedPack.getStringLikerPack(partCategory.getCategoryName(), "categoryName", packBean); } @@ -986,13 +968,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesPackSpec(MesPackSpec packSpec, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(packSpec, organizeCode); - if (StringUtils.isNotEmpty(packSpec.getSpecCode())) { + if (!StringUtils.isEmpty(packSpec.getSpecCode())) { DdlPreparedPack.getStringLikerPack(packSpec.getSpecCode(), "specCode", packBean); } - if (StringUtils.isNotEmpty(packSpec.getSpecName())) { + if (!StringUtils.isEmpty(packSpec.getSpecName())) { DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean); } - if (StringUtils.isNotEmpty(packSpec.getParentSpec())) { + if (!StringUtils.isEmpty(packSpec.getParentSpec())) { DdlPreparedPack.getStringEqualPack(packSpec.getParentSpec(), "parentSpec", packBean); } @@ -1007,10 +989,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesProduceCategory(MesProduceCategory produceCategory, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(produceCategory, organizeCode); - if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryCode())) { + if (!StringUtils.isEmpty(produceCategory.getProduceCategoryCode())) { DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean); } - if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryName())) { + if (!StringUtils.isEmpty(produceCategory.getProduceCategoryName())) { DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryName(), "produceCategoryName", packBean); } @@ -1025,7 +1007,7 @@ public class MesHqlPack { */ public static DdlPackBean getMesKpsnRule(MesKpsnRule kpsnRule, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(kpsnRule, organizeCode); - if (StringUtils.isNotEmpty(kpsnRule.getPartNo())) { + if (!StringUtils.isEmpty(kpsnRule.getPartNo())) { DdlPreparedPack.getStringLikerPack(kpsnRule.getPartNo(), "partNo", packBean); } @@ -1040,10 +1022,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesPartScheduleBom(MesPartScheduleBom partScheduleBom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(partScheduleBom, organizeCode); - if (StringUtils.isNotEmpty(partScheduleBom.getPartNo())) { + if (!StringUtils.isEmpty(partScheduleBom.getPartNo())) { DdlPreparedPack.getStringLikerPack(partScheduleBom.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(partScheduleBom.getItemPartNo())) { + if (!StringUtils.isEmpty(partScheduleBom.getItemPartNo())) { DdlPreparedPack.getStringLikerPack(partScheduleBom.getItemPartNo(), "itemPartNo", packBean); } @@ -1058,10 +1040,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesObjectDao(MesObjectDao objectDao, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode); - if (StringUtils.isNotEmpty(objectDao.getObjectCode())) { + if (!StringUtils.isEmpty(objectDao.getObjectCode())) { DdlPreparedPack.getStringLikerPack(objectDao.getObjectCode(), "objectCode", packBean); } - if (StringUtils.isNotEmpty(objectDao.getDaoClass())) { + if (!StringUtils.isEmpty(objectDao.getDaoClass())) { DdlPreparedPack.getStringLikerPack(objectDao.getDaoClass(), "daoClass", packBean); } @@ -1076,10 +1058,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode); - if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())) { + if (!StringUtils.isEmpty(pcnSyncCfg.getObjectCode())) { DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean); } - if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())) { + if (!StringUtils.isEmpty(pcnSyncCfg.getPcnCode())) { DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); } if (null != pcnSyncCfg.getSyncType()) { @@ -1097,10 +1079,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode); - if (StringUtils.isNotEmpty(workCellParamCfg.getWorkCellCode())) { + if (!StringUtils.isEmpty(workCellParamCfg.getWorkCellCode())) { DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean); } - if (StringUtils.isNotEmpty(workCellParamCfg.getParamCode())) { + if (!StringUtils.isEmpty(workCellParamCfg.getParamCode())) { DdlPreparedPack.getStringLikerPack(workCellParamCfg.getParamCode(), "paramCode", packBean); } @@ -1115,7 +1097,7 @@ public class MesHqlPack { */ public static DdlPackBean getMesWorkCellParam(MesWorkCellParam workCellParam, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParam, organizeCode); - if (StringUtils.isNotEmpty(workCellParam.getParamCode())) { + if (!StringUtils.isEmpty(workCellParam.getParamCode())) { DdlPreparedPack.getStringLikerPack(workCellParam.getParamCode(), "paramCode", packBean); } if (null != workCellParam.getParamType()) { @@ -1136,7 +1118,7 @@ public class MesHqlPack { */ public static DdlPackBean getMesWorkCellPoint(MesWorkCellPoint workCellPoint, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellPoint, organizeCode); - if (StringUtils.isNotEmpty(workCellPoint.getWorkCellCode())) { + if (!StringUtils.isEmpty(workCellPoint.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean); } return packBean; @@ -1150,13 +1132,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesPLCConfigure(MesPLCConfigure plcConfigure, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(plcConfigure, organizeCode); - if (StringUtils.isNotEmpty(plcConfigure.getAreaCode())) { + if (!StringUtils.isEmpty(plcConfigure.getAreaCode())) { DdlPreparedPack.getStringEqualPack(plcConfigure.getAreaCode(), "areaCode", packBean); } - if (StringUtils.isNotEmpty(plcConfigure.getWorkCenterCode())) { + if (!StringUtils.isEmpty(plcConfigure.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(plcConfigure.getWorkCenterCode(), "workCenterCode", packBean); } - if (StringUtils.isNotEmpty(plcConfigure.getWorkCellCode())) { + if (!StringUtils.isEmpty(plcConfigure.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(plcConfigure.getWorkCellCode(), "workCellCode", packBean); } return packBean; @@ -1172,13 +1154,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesNumberRule(MesNumberRule numberRule, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(numberRule, organizeCode); - if (StringUtils.isNotEmpty(numberRule.getRuleCode())) { + if (!StringUtils.isEmpty(numberRule.getRuleCode())) { DdlPreparedPack.getStringLikerPack(numberRule.getRuleCode(), "ruleCode", packBean); } - if (StringUtils.isNotEmpty(numberRule.getNumberRule())) { + if (!StringUtils.isEmpty(numberRule.getNumberRule())) { DdlPreparedPack.getStringLikerPack(numberRule.getNumberRule(), "numberRule", packBean); } - if (StringUtils.isNotEmpty(numberRule.getPrefix())) { + if (!StringUtils.isEmpty(numberRule.getPrefix())) { DdlPreparedPack.getNumEqualPack(numberRule.getPrefix(), "prefix", packBean); } if (null != numberRule.getIsCycle()) { @@ -1244,7 +1226,7 @@ public class MesHqlPack { */ public static DdlPackBean getMesButtonStatus(MesButtonStatus buttonStatus, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(buttonStatus, organizeCode); - if (StringUtils.isNotEmpty(buttonStatus.getButtonCode())) { + if (!StringUtils.isEmpty(buttonStatus.getButtonCode())) { DdlPreparedPack.getStringLikerPack(buttonStatus.getButtonCode(), "buttonCode", packBean); } packBean.setOrderByStr(buttonStatus.orderBy()); @@ -1260,10 +1242,10 @@ public class MesHqlPack { public static DdlPackBean getApprovalData(MesWorkOrder mesWorkOrder, String organizeCode) { DdlPackBean packBean = MesHqlPack.getAllBaseData(organizeCode); DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); - if (!org.springframework.util.StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { + if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { DdlPreparedPack.getStringEqualPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); } - if (!org.springframework.util.StringUtils.isEmpty(mesWorkOrder.getPartNo())) { + if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", packBean); } DdlPreparedPack.getNumEqualPack(MesEnumUtil.WORK_ORDER_APPROVAL_STATUS.WAIT_APPROVAL.getValue(), "approvalStatus", packBean); @@ -1271,4 +1253,5 @@ public class MesHqlPack { DdlPreparedPack.getOrderByPack(new String[]{String.valueOf(CommonEnumUtil.ASC_OR_DESC.ASC.getValue())}, new String[]{"startTime", "shiftCode"}, packBean); return packBean; } + }