From d6def493e48e9ff711080056c1868ebd9aa45bba Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Tue, 12 Mar 2019 18:13:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?bean=E4=BF=AE=E6=94=B9=20=E5=90=8C=E6=AD=A5?= =?UTF-8?q?pdm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java | 12 ++++++------ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java | 4 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 10 +++++++++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 8 ++++++-- 9 files changed, 33 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java index ccbbfea..e0d2b87 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -28,16 +28,16 @@ import javax.persistence.Table; @Api("工厂仓库信息") public class WareHouse extends BaseBean { - @Column(name="CODE") + @Column(name="WM_NO") @ApiParam("仓库代码") - public String code; + public String wmNo; - @Column(name="NAME") + @Column(name="WM_NAME") @ApiParam("仓库名称") - public String name; + public String wmName; - @Column(name="ADDRESS") + @Column(name="WM_ADDR") @ApiParam("仓库地址") - public String address; + public String wmAddr; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index 5586f68..3e6ecc4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -43,4 +43,8 @@ public class WmsActionModule extends BaseBean { @Column(name="AM_TYPE") @ApiParam(value = "组件类型", example = "0") public Integer amType; + + @Column(name="OP_TYPE_CODE") + @ApiParam(value = "作业类型", example = "0") + public Integer opTypeCode; } 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 627176c..3aeca7d 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 @@ -63,7 +63,7 @@ public class WmsCheckFactRecord extends BaseBean { @Column(name="REMARK") @ApiParam("备注") - public String reMark; + public String remark; @Column(name="PLAN_QTY") @ApiParam(value = "应收数量", example = "0") 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 2831670..2020250 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 @@ -62,7 +62,7 @@ public class WmsMoveSn extends BaseBean { @Column(name="REMARK") @ApiParam("备注") - public String reMark; + public String remark; @Column(name="LOT_NO") @ApiParam("批次编号") @@ -132,6 +132,14 @@ public class WmsMoveSn extends BaseBean { @ApiParam(value = "目的条码状态", example = "1") public Integer destSnStatus; + @Column(name="DATE_CODE") + @ApiParam("生产日期") + public String dateCode; + + @Column(name="FIX_LOT_NO") + @ApiParam("特殊批次") + public String fixLotNo; + public WmsMoveSn(){} public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ 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 5639e4c..1583f39 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 @@ -61,7 +61,7 @@ public class WmsQCDetails extends BaseBean { @Column(name = "REMARK") @ApiParam("备注") - public String reMark; + public String remark; @Column(name = "FACT_QTY") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 59bb3ef..9663b9f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -50,7 +50,7 @@ public class WmsQCMaster extends BaseBean { @Column(name = "REMARK") @ApiParam("备注") - public String reMark; + public String remark; @Column(name = "CUSTOMER_NO") @ApiParam("客户编号") 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 a35f07d..d34efd0 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 @@ -52,6 +52,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam("单位") public String unit; + @Column(name = "CUST_NO") + @ApiParam(value = "客户编码") + private String custNo; + @Column(name = "QTY") @ApiParam(value = "可用数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index b1b7c0c..a4a7b00 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -46,7 +46,7 @@ public class WmsTaskInfo extends BaseBean { @Column(name = "REMARK") @ApiParam("备注") - public String reMark; + public String remark; /** * 状态:1=创建,10=待处理,20=已处理 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 9b80d12..f858769 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 @@ -45,11 +45,11 @@ public class WmsTransQuan extends BaseBean { private String locateNo; @Column(name = "PART_NO") - @ApiParam(value = "零件编号") + @ApiParam(value = "物料编码") private String partNo; @Column(name = "PART_NAME_RDD") - @ApiParam(value = "零件名称") + @ApiParam(value = "物料名称") private String partNameRdd; @Column(name = "UNIT") @@ -95,4 +95,8 @@ public class WmsTransQuan extends BaseBean { @Column(name = "CUST_NO") @ApiParam(value = "客户编号") private String custNo; + + @Column(name = "ERROR_MESSAGE") + @ApiParam(value = "错误信息") + private String errorMessage; } From 56568be77e6ff3ce026aaca75ad1ebdbd43f9a2d Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Tue, 12 Mar 2019 18:47:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?bean=E4=BF=AE=E6=94=B9=20WmsHqlPack=20?= =?UTF-8?q?=E5=90=8C=E6=AD=A5pdm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 760566e..cc715fa 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 @@ -309,9 +309,9 @@ public class WmsHqlPack { public static String packHqlWareHouse(WareHouse wareHouse) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); - HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); - HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); + HqlPack.getStringLikerPack(wareHouse.getWmAddr(), "wmAddr", result); + HqlPack.getStringLikerPack(wareHouse.getWmNo(), "wmNo", result); + HqlPack.getStringLikerPack(wareHouse.getWmName(), "wmName", result); getStringBuilderPack(wareHouse, result); @@ -368,8 +368,8 @@ public class WmsHqlPack { public static String packHqlWareHouseUnique(WareHouse wareHouse) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wareHouse.getName(), "name", result); - HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result); + HqlPack.getStringEqualPack(wareHouse.getWmName(), "wmName", result); + HqlPack.getStringEqualPack(wareHouse.getWmNo(), "wmCode", result); HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result); getStringBuilderPack(wareHouse, result); @@ -645,7 +645,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result); HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result); HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result); + HqlPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result); HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); getStringBuilderPack(wmsTaskInfo, result); From c0be6489a36202050a488a17544192e8180eb426 Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Wed, 13 Mar 2019 09:14:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?bean=E4=BF=AE=E6=94=B9=20Warehouse=20?= =?UTF-8?q?=E5=9B=9E=E9=80=80=E4=B8=BA=E5=8E=9F=E6=9D=A5=E7=9A=84code=20?= =?UTF-8?q?=E3=80=81=20name=20=E3=80=81address?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java | 12 ++++++------ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java index e0d2b87..ccbbfea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -28,16 +28,16 @@ import javax.persistence.Table; @Api("工厂仓库信息") public class WareHouse extends BaseBean { - @Column(name="WM_NO") + @Column(name="CODE") @ApiParam("仓库代码") - public String wmNo; + public String code; - @Column(name="WM_NAME") + @Column(name="NAME") @ApiParam("仓库名称") - public String wmName; + public String name; - @Column(name="WM_ADDR") + @Column(name="ADDRESS") @ApiParam("仓库地址") - public String wmAddr; + public String address; } 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 cc715fa..c373f02 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 @@ -309,9 +309,9 @@ public class WmsHqlPack { public static String packHqlWareHouse(WareHouse wareHouse) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wareHouse.getWmAddr(), "wmAddr", result); - HqlPack.getStringLikerPack(wareHouse.getWmNo(), "wmNo", result); - HqlPack.getStringLikerPack(wareHouse.getWmName(), "wmName", result); + HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); + HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); + HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); getStringBuilderPack(wareHouse, result); @@ -368,8 +368,8 @@ public class WmsHqlPack { public static String packHqlWareHouseUnique(WareHouse wareHouse) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wareHouse.getWmName(), "wmName", result); - HqlPack.getStringEqualPack(wareHouse.getWmNo(), "wmCode", result); + HqlPack.getStringEqualPack(wareHouse.getName(), "name", result); + HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result); HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result); getStringBuilderPack(wareHouse, result); From 093a67f5411898dd04a8018f1e44dd2f12a0be5e Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 13 Mar 2019 10:44:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=A7=A3=E6=9E=90Demo=20=E5=85=83=E7=B4=A0=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=A0=A1=E9=AA=8C=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index db477bd..22e016a 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -165,4 +165,20 @@ public class ReportHqlPack { return result.toString(); } + + /** + * 元素名称是否存在 + * @param brElement + * @return + */ + public static String packHqlBrElementName(BrElement brElement){ + StringBuffer result = new StringBuffer(); + + // and + HqlPack.getStringEqualPack(brElement.getElementName(),"elementName",result); + // not + HqlPack.getNumNOEqualPack(brElement.getId(),"id",result); + + return result.toString(); + } }