From 73181f1c1a21eb33dd0e286da70cc1b2fd64af14 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 4 Mar 2019 20:56:48 +0800 Subject: [PATCH 01/46] =?UTF-8?q?WMS=E5=AE=9E=E4=BD=93=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=8C=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 418 +++++---------------- .../estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 8 + .../estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/WmsButton.java | 70 ---- .../i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java | 59 +++ .../pojo/wms/bean/WmsDocMovementDetails.java | 22 +- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 + .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 67 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsField.java | 127 ------- .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 17 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsObject.java | 93 ----- .../cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java | 62 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java | 6 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 + .../estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 112 ++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java | 42 +++ .../estsh/i3plus/pojo/wms/bean/WmsTransModule.java | 50 +++ .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 20 + .../cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java | 8 + .../pojo/wms/repository/WmsButtonRepository.java | 14 - .../pojo/wms/repository/WmsFieldRepository.java | 16 - .../pojo/wms/repository/WmsObjectRepository.java | 16 - .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 5 +- 27 files changed, 571 insertions(+), 693 deletions(-) delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsButton.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsButtonRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsObjectRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 5495266..22163ea 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -49,9 +49,9 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_DETAILS_STATUS { - NORMAL(1, "N", "正常"), - ANCEL(10, "C", "行取消"), - RECEIPTED(20, "R", "已收货"); + NORMAL(10, "N", "正常"), + RECEIPTED(20, "R", "已完成"), + ANCEL(30, "C", "行取消"); private int value; private String code; @@ -101,8 +101,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_SRC { - MNU(1, "MNU", "手工"), - ERP(2, "ERP", "ERP接口"); + MNU(10, "MNU", "手工"), + ERP(20, "ERP", "ERP接口"); private int value; private String code; @@ -152,10 +152,10 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_TYPE { - REG(1, "REG", "原物料采购"), - SUB(10, "SUB", "委外采购"), - TAR(20, "TAR", "多角贸易采购"), - TAP(30, "TAP", "多角代采购"); + REG(10, "REG", "原物料采购"), + SUB(20, "SUB", "委外采购"), + TAR(30, "TAR", "多角贸易采购"), + TAP(40, "TAP", "多角代采购"); private int value; private String code; @@ -205,13 +205,13 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_STATUS { - CREATE(1, "新建"), + CREATE(10, "新建"), RECEIPT(10, "收货中"), RECEIPT_FINISH(20, "收货完成"), WAREHOUSING(30, "入库中"), WAREHOUSING_FINISH(40, "入库完成"), - CLOSED(90, "已关闭"), - CANCELLED(91, "已取消"); + CLOSED(50, "已关闭"), + CANCELLED(60, "已取消"); private int value; private String description; @@ -251,16 +251,18 @@ public class WmsEnumUtil { } /** - * 交易状态 + * PO条码状态信息 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TRANS_STATUS { - CREATE(1, "创建"), FINISH(2, "完成"), FAIL(3, "失败"); + public enum SN_DETAILS_STATUS { + CREATE(10, "新建"), + WAREHOUSING(30, "已打印"), + RECEIPT_FINISH(20, "已收货"); private int value; private String description; - TRANS_STATUS(int value, String description) { + SN_DETAILS_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -282,8 +284,17 @@ public class WmsEnumUtil { } 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; + } + } /** * 消息队列，队列名称 @@ -294,7 +305,7 @@ public class WmsEnumUtil { public enum QUEUE_NAME { SUCCESS_QUEUE(1, "wms_success_queue", "成功消息队列"), - FAIL_QUEUE(2, "wms_fail_queue", "成功消息队列"); + PENDING_QUEUE(2, "wms_pending_queue", "待处理消息队列"); private int value; private String name; @@ -393,7 +404,8 @@ public class WmsEnumUtil { MANEUVER_LOCATE(30, "R", "机动库"), COMBINATION_LOCATE(40, "D", "组合库"), LINE_LOCATE(50, "L", "线边库"), - NC_LOCATE(60, "N", "NC库"); + NC_LOCATE(60, "N", "NC库"), + SPILLAGE_LOCATE(70, "Y", "溢料库"); private int value; private String code; @@ -443,9 +455,9 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_MOVE_TYPE { - IN_STORE(1, "IN", "入库"), - OUT_STORE(10, "OUT", "出库"), - MOVE_STORE(20, "MOVE", "移库"); + IN_STORE(10, "IN", "入库"), + OUT_STORE(20, "OUT", "出库"), + MOVE_STORE(30, "MOVE", "移库"); private int value; private String code; @@ -495,18 +507,20 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_BUSI_TYPE { - RECEIVE_GOODS(1, "RC", "收货"), - QUALITY_TESTING(10, "QC", "质检"), - IN_STORE(20, "IN", "入库"), - MIX_RECEIVE(30, "ZI", "杂收"), - MIX_SEND(40, "ZO", "杂发"), - SUPPLIER_RETURN_GOODS(50, "VJ", "供应商退货"), - CUSTOMER_RETURN_GOODS(60, "CJ", "客户退货"), - ORDER_PICKING_PART(70, "WP", "工单领料"), - ORDER_RETURN_PART(80, "WJ", "工单退料"), - MOVE_IN(90, "MI", "移库入库"), - MOVE_OUT(100, "MO", "移库出库"), - SEND(110, "SO", "发运"); + PRODUCTION_MATERIAS(10, "PROD_MATERIALS", "生产领料"), + CUSTOMER_SHPING(20, "CUS_SHPING", "客户发运"), + OUTWARD_SHIPMENT(30, "OUT_SHIPMENT", "委外发运"), + ALLOCATION(40, "ALLOCATION", "调拨"), + SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"), + SCATTERED_IN(60, "SCATTERED_IN", "零星入库"), + NC_WAREHOSING(70, "NC_WAREHOSING", "NC入库"), + SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"), + CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"), + PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"), + INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"), + SCRAPPING_OUT(120, "SCRAPPING_OUT", "报废出库"), + RECEIVING_IN(130, "RECEIVING_IN", "收货入库"), + OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"); private int value; private String code; @@ -556,11 +570,11 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_STATUS { - CREATE(1, "新建"), - RECEIPT(10, "处理中"), - RECEIPT_FINISH(20, "已完成"), - CLOSED(90, "已关闭"), - CANCELLED(91, "已取消"); + CREATE(10, "新建"), + RECEIPT(20, "处理中"), + RECEIPT_FINISH(30, "已完成"), + CLOSED(40, "已关闭"), + CANCELLED(50, "已取消"); private int value; private String description; @@ -600,105 +614,6 @@ public class WmsEnumUtil { } /** - * 外部单据：移库单详情单位 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum OUT_MOVEMENT_DETAILS_UNIT { - CREATE(1, "AA"), - RECEIPT(2, "BB"), - RECEIPT_FINISH(3, "CC"), - CLOSED(4, "DD"), - CANCELLED(5, "EE"); - - private int value; - private String description; - - OUT_MOVEMENT_DETAILS_UNIT(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - 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 OUT_MOVEMENT_DETAILS_STATUS { - NORMAL(1, "N", "正常"), - CANCEL(2, "C", "取消"); - - private int value; - private String code; - private String description; - - OUT_MOVEMENT_DETAILS_STATUS(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; - } - } - - /** * 物料：分类（ABC） */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -862,20 +777,18 @@ public class WmsEnumUtil { /** * 业务表：库存条码状态 + * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_STATUS { CREATE(1, "创建"), - RECEIVED(10, "已收货"), - QUALITY_TESTED(20, "已质检"), - PUTIN_STORE(30, "已入库"), - WAIT_OUT_STORE(40, "待出库"), - IS_OUT_STORE(50, "已出库"), - ON_THE_WAY(60, "在途"), - QUARANTINED(70, "已隔离"), - BREAK_BUG(80, "破包"), - FROZEN(90, "冻结"), - CANCEL(100, "作废"); + QUALITY_CONTROL(10, "质检中"), + PRE_INSTOCK(20, "待入库"), + INSTOCKED(30, "入库"), + PICKED(40, "配料"), + OUT_STOCK(50, "出库"), + SCRAPED(60, "报废"), + COMMING(70, "在途"); private int value; private String description; @@ -919,10 +832,9 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_QC_STATUS { - CREATE(1, "未质检"), - RECEIVED(10, "质检合格"), - QUALITY_TESTED(20, "质检不合格"), - PUTIN_STORE(30, "已退货"); + QUALIFIED(10, "合格"), + UNQUALIFIED(20, "不合格"), + QUAEANTINE(30, "隔离"); private int value; private String description; @@ -1003,12 +915,12 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CS_ORDER_STATUS { - CREATE(1, "创建"), - FROZEN(10, "已冻结"), - IN_INVENTORY(20, "盘点中"), - INVENTORY_FINISH(30, "盘点完成"), - THAWING(40, "已解冻"), - CLOSED(50, "已关闭"); + CREATE(10, "创建"), + STARTING_INVENTORY(20, "开启盘点"), + IN_INVENTORY(30, "盘点中"), + INVENTORY_FINISH(40, "盘点完成"), + THAWING(50, "已解冻"), + CLOSED(60, "已关闭"); private int value; private String description; @@ -1038,97 +950,15 @@ public class WmsEnumUtil { } /** - * 盘点冻结 质检状态 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum QC_STATUS { - NO_QC(1, "未质检"), - IN_QC(10, "质检中"), - QUALIFIED_QC(20, "质检合格"), - DISQUALIFIED_QC(30, "质检不合格"), - RETURN_GOODS(40, "已退货"); - - private int value; - private String description; - - QC_STATUS(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - 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; - } - } - - /** - * 盘点冻结 条码状态 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SN_STATUS { - CREATE(1, "创建"), - RECEIVE_GOODS(10, "已收货"), - QUALITY_TESTING(20, "已质检"), - IN_STORE(30, "已入库"), - WAIT_STORE(40, "待出库"), - OUT_STORE(50, "已出库"), - ON_PASSAGE(60, "在途"), - QUARANTINE(70, "已隔离"), - BALE_BROKEN(80, "破包"), - FROZEN(90, "冻结"), - RETURN_GOODS(100, "取消冻结"); - - private int value; - private String description; - - SN_STATUS(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - 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; - } - } - - /** * 盘点冻结 处理状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CS_TRANS_STATUS { - CREATE(1, "已创建"), - INVENTORY(5, "已盘"), - FROZEN(10, "已冻结"), - THAWING(20, "已解冻"), - RETURN_GOODS(30, "取消冻结"); + CREATE(10, "已创建"), + INVENTORY(20, "已盘"), + FROZEN(30, "已冻结"), + THAWING(40, "已解冻"), + RETURN_GOODS(50, "取消冻结"); private int value; private String description; @@ -1192,11 +1022,14 @@ public class WmsEnumUtil { } /** - * 库存移动单状态 状态:1=创建,10=待处理,20=已处理 + * 库存移动单状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MOVE_ORDER_STATUS { - CREATE(1, "创建"),BE_HANDLE(10, "待处理"),FINISH(20, "已处理"); + CREATE(10, "创建"), + BE_HANDLE(20, "待处理"), + FINISH(30, "已处理"), + HANDLE_ERROR(40, "处理出错"); private int value; private String description; @@ -1231,7 +1064,10 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_INFO_TYPE { - FEED(1, "进料检验"), ONLINE(10, "在线检验"), EMDPRODUCT(30, "成品检验"), SHIPMENTS(40, "出货检验"); + FEED(1, "进料检验"), + ONLINE(10, "在线检验"), + EMDPRODUCT(30, "成品检验"), + SHIPMENTS(40, "出货检验"); private int value; private String description; @@ -1265,11 +1101,11 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_INFO_STATUS { - CREATE(1, "创建"), - FINISH(5, "待处理"), - FAIL(10, "已完成"), - CLOSE(90, "已关闭"), - CANCEL(91, "已取消"); + CREATE(10, "新建"), + FINISH(20, "待处理"), + FAIL(30, "已完成"), + CLOSE(40, "已关闭"), + CANCEL(50, "已取消"); private int value; private String description; @@ -1369,40 +1205,6 @@ public class WmsEnumUtil { } /** - * 是否 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TRUE_OR_FALSE { - CHARGING(1, "是"), GRATIS(2, "否"); - - private int value; - private String description; - - TRUE_OR_FALSE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - 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; - } - } - - /** * 作业流程动作类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -1631,7 +1433,7 @@ public class WmsEnumUtil { PROCESS_INITIALIZATION(20, "流程初始化组件"), PROCESS_END(30, "流程结束组件"), DETAIL_PROCESS(40, "明细处理组件"), - BACK_DISPLAY(50, "回显示组件"); + BACK_DISPLAY(50, "回显方法"); private int value; private String description; @@ -1661,44 +1463,6 @@ public class WmsEnumUtil { } /** - * 作业步骤处理组件类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ACTION_MODULE_TYPE { - HANDLE(10, "流程处理组件"), - INIT(20, "流程初始化组件"), - END(30, "流程结束组件"), - DETAILS(40, "明细处理组件"), - SHOW(50, "回显示组件"); - - private int value; - private String description; - - ACTION_MODULE_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - 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; - } - } - - /** * 条码类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -1870,8 +1634,6 @@ public class WmsEnumUtil { } } - - /** * 可选项类型枚举 */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 4da7db6..d18a25a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -63,4 +63,12 @@ public class WmsASNMaster extends BaseBean { @Column(name="PO_NO") @ApiParam("PO单号") public String poNo; + + @Column(name = "CONTAINER_NO") + @ApiParam("集装箱号") + public String containerNo; + + @Column(name="IS_TASK") + @ApiParam(value = "是否生产任务", example = "1") + public Integer isTask; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java index 0d74dea..0014c6d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java @@ -76,4 +76,8 @@ public class WmsAreaOwner extends BaseBean { @Transient @ApiParam(value = "库位名称") private String locateName; + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编号") + private String custNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsButton.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsButton.java deleted file mode 100644 index aedda38..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsButton.java +++ /dev/null @@ -1,70 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description :元数据按钮信息表 - * @Reference : - * @Author : hansen.ke - * @CreateDate : 2018-11-02 9:33 - * @Modify: - **/ -@Data -@Entity -@Table(name="WMS_BUTTON") -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Api(value="元数据按钮信息表",description = "元数据按钮信息表") -public class WmsButton extends BaseBean { - - @Column(name = "CODE") - @ApiParam(value = "元数据编码") - private String code; - - @Column(name = "NAME") - @ApiParam(value = "按钮名称") - private String name; - - @Column(name = "ICON") - @ApiParam(value = "图标") - private String icon; - - @Column(name = "UI") - @ApiParam(value = "按钮UI路径") - private String ui; - - @Column(name = "BS") - @ApiParam(value = "按钮BS路径") - private String bs; - - @Column(name = "URL") - @ApiParam(value = "服务端URL") - private String url; - - @Column(name = "ORDER_NUM") - @ApiParam(value = "排序号",example = "1") - private Integer orderNum; - - @Column(name = "GROUP_NUM") - @ApiParam(value = "分组号",example = "1") - private Integer groupNum; - - @Column(name = "IS_BASE") - @ApiParam(value = "是否基础功能",example = "2") - private Integer isBase; - - @Column(name = "IS_HIDE") - @ApiParam(value = "是否删除",example = "2") - private Integer isHide; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index a450d3f..5a09848 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -51,4 +51,8 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name="REMARK") @ApiParam("备注") public String reMark; + + @Column(name="IS_INVENTORY") + @ApiParam(value = "是否允许清点", example = "1") + public Integer isInventory; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java index f5fbc81..4005feb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java @@ -39,4 +39,8 @@ public class WmsCSPart extends BaseBean { @Column(name="PART_NAME_RDD") @ApiParam("物料名称") public String partNameRdd; + + @Column(name="IS_ADJUST") + @ApiParam(value = "调整标识", example = "1") + public Integer isAdjust; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java new file mode 100644 index 0000000..1d5d945 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :作业步骤类型信息 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 9:33 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_DATA_AUTH") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="数据权限信息",description = "数据权限信息") +public class WmsDataAuth extends BaseBean { + + @Column(name = "ROLE_CODE") + @ApiParam(value = "角色编号") + private String roleCode; + + @Column(name = "DATA_OBJ") + @ApiParam(value = "数据对象") + private String dataObj; + + @Column(name = "DATA_OBJ_VALUE") + @ApiParam(value = "数据对象值") + private String dataObjValue; + + @Column(name = "ADD_OP") + @ApiParam(value = "新增操作", example = "0") + private Integer addOp; + + @Column(name = "DEL_OP") + @ApiParam(value = "删除操作", example = "0") + private Integer delOp; + + @Column(name = "UPD_OP") + @ApiParam(value = "修改操作", example = "0") + private Integer updOp; + + @Column(name = "QUERY_OP") + @ApiParam(value = "查询操作", example = "0") + private Integer queryOp; + +} 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 287fde2..ea58ba7 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 @@ -63,10 +63,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "条码打印数量", example = "1") private Double printQty; - @Column(name = "FACT_QTY") - @ApiParam(value = "操作完成数量", example = "1") - private Double factQty; - @Column(name = "ZDATE") @ApiParam(value = "计划日期") private String zdate; @@ -97,22 +93,14 @@ public class WmsDocMovementDetails extends BaseBean { private String remark; @Column(name = "PICK_QTY") - @ApiParam(value = "已配数量", example = "1") + @ApiParam(value = "已拣货数量", example = "1") private Double pickQty; @Column(name = "OUT_QTY") - @ApiParam(value = "已提交数量", example = "1") + @ApiParam(value = "已出库数量", example = "1") private Double outQty; - @Column(name = "INLINE_QTY") - @ApiParam(value = "已上线数量", example = "1") - private Double inlineQty; - - @Column(name = "REJECT_QTY") - @ApiParam(value = "退料数量", example = "1") - private Double rejectQty; - - @Column(name = "REJECT_POST_QTY") - @ApiParam(value = "退料提交数量", example = "1") - private Double rejectPostQty; + @Column(name = "REC_QTY") + @ApiParam(value = "已收货数量", example = "1") + private Double recQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 3c168e6..e7d4099 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -99,4 +99,12 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "数量", example = "1") private Double qty; + @Column(name="IS_TASK") + @ApiParam(value = "是否生产任务", example = "1") + public Integer isTask; + + @Column(name="PRIORITY") + @ApiParam(value = "优先级", example = "1") + public Integer priority; + } 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 new file mode 100644 index 0000000..8f56b49 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 移库单条码表 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-28 15:20 + * @Modify: + * 2018-12-10 10:39:46 Test + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_DOC_MOVEMENT_SN") +@Api("PO条码信息") +public class WmsDocMovementSn extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("订单号") + public String orderNo; + + @Column(name="ITEM") + @ApiParam("行号") + public String item; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="QTY") + @ApiParam(value = "数量", example = "0") + public Double qty; + + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + /** + * 状态:10 = 创建，20 = 已打印，30 = 已收货 + */ + @Column(name="SN_STATUS") + @ApiParam(value = "状态", example = "10") + public Integer snStatus; + + @Column(name="SN_1D") + @ApiParam("一维条码") + public String snOneBarCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java deleted file mode 100644 index 93dd493..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java +++ /dev/null @@ -1,127 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : 元数据字段表 - * @Reference : - * @Author : amy - * @CreateDate : 2018-11-02 10:00 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_FIELD") -@Api("元数据字段表") -public class WmsField extends BaseBean{ - - @Column(name = "OBJECT_CODE") - @ApiParam("对象编码") - private String objectCode; - - @Column(name = "FIELD_NUM") - @ApiParam(value = "表单分组序号",example = "-1") - private Integer fieldNum; - - @Column(name = "ORDER_NUM") - @ApiParam(value = "排序索引",example = "-1") - private Integer orderNum; - - @Column(name = "FIELD_SET") - @ApiParam("表单分组") - private String fieldSet; - - @Column(name = "TABLE_NAME") - @ApiParam("字段表名") - private String tableName; - - @Column(name = "FIELD_EN") - @ApiParam("英文名") - private String fieldEn; - - @Column(name = "FIELD_CN") - @ApiParam("中文名") - private String fieldCn; - - @Column(name = "TYPE") - @ApiParam("控件类型") - private String type; - - @Column(name = "EXP") - @ApiParam("控件表达式") - private String exp; - - @Column(name = "IS_QUERY") - @ApiParam(value = "是否可查询", example = "2") - private Integer isQuery; - - @Column(name = "IS_SHOW") - @ApiParam(value = "是否可显", example = "1") - private Integer isShow; - - @Column(name = "IS_DISABLE") - @ApiParam(value = "是否禁用", example = "2") - private Integer isDisable; - - @Column(name = "IS_ORDER") - @ApiParam(value = "是否可排序", example = "1") - private Integer isOrder; - - @Column(name = "IS_EDIT") - @ApiParam(value = "是否可编辑字段", example = "1") - private Integer isEdit; - - @Column(name = "IS_REQURIED") - @ApiParam(value = "是否必填", example = "1") - private Integer isRequried; - - @Column(name = "IS_MULTIPLE") - @ApiParam(value = "是否多选项", example = "2") - private Integer isMultiple; - - @Column(name = "PLACEHOLDER") - @ApiParam("输入提示") - private String placeholder; - - @Column(name = "VALIDATOR") - @ApiParam(value = "是否可编辑字段", example = "2") - private Integer validator; - - @Column(name = "DEFAULTER") - @ApiParam("默认值") - private String defaulter; - - @Column(name = "ADD_STATUS") - @ApiParam(value = "状态", example = "1") - private Integer addStatus; - - @Column(name = "DATA_TYPE") - @ApiParam(value = "数据类型", example = "1") - private Integer dataType; - - @Column(name = "DATA_TYPE_NAME") - @ApiParam("数据类型名称") - private String dataTypeName; - - @Column(name = "DATA_SIZE") - @ApiParam(value = "整数位长度", example = "1") - private Integer dataSize; - - @Column(name = "DATA_DECIMAL") - @ApiParam(value = "小数位长度", example = "1") - private Integer dataDecimal; - -} 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 dc89b72..6e17fab 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 @@ -67,9 +67,9 @@ public class WmsLocate extends BaseBean { @ApiParam(value ="序号", example = "-1") private Integer seq; - @Column(name="IS_EMPTY") - @ApiParam(value ="是否空库位", example = "-1") - private Integer isEmpty; + @Column(name="STATUS") + @ApiParam(value ="库位状态", example = "-1") + private Integer status; @Column(name="MAX_PACKAGE_QTY") @ApiParam(value ="最大包装数量", example = "-1") @@ -83,4 +83,15 @@ public class WmsLocate extends BaseBean { @ApiParam(value ="存放单位") private String stockUnit; + @Column(name="LINE_CODE") + @ApiParam(value ="生产线") + private String lineCode; + + @Column(name="BOX_QTY") + @ApiParam(value ="箱数", example = "-1") + private Integer boxQty; + + @Column(name="PART_QTY") + @ApiParam(value ="零件数", example = "-1") + private Integer partQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java deleted file mode 100644 index f8612cd..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java +++ /dev/null @@ -1,93 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; - -/** - * @Description : - * @Reference : - * @Author : amy - * @CreateDate : 2018-11-02 10:37 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_OBJECT") -@Api("元数据信息表") -public class WmsObject extends BaseBean { - - @Column(name = "CODE") - @ApiParam("对象编码") - private String code; - - @Column(name = "NAME") - @ApiParam("对象名称") - private String name; - - @Column(name = "VIEW_NAME") - @ApiParam("查询数据视图") - private String viewName; - - @Column(name = "TABLE_NAME") - @ApiParam("保存数据主表") - private String tableName; - - @Column(name = "PK_NAME") - @ApiParam("主键") - private String pkName; - - @Column(name = "DATA_SOURCE") - @ApiParam("数据源") - private String dataSource; - - @Column(name = "IS_SINGLE") - @ApiParam(value = "是否单选", example = "1") - private Integer isSingle; - - @Column(name = "IS_CELL_EDIT") - @ApiParam(value = "是否可行内编辑", example = "2") - private Integer isCellEdit; - - @Column(name = "IS_SHOW_NUM") - @ApiParam(value = "是否显示行号", example = "1") - private Integer isShowNum; - - @Column(name = "IS_FIRST_LOAD") - @ApiParam(value = "是否初始加载", example = "1") - private Integer isFirstLoad; - - @Column(name = "FILTER") - @ApiParam("初始数据过滤条件") - private String filter; - - @Column(name = "DEFAULT_ORDER") - @ApiParam("默认排序字段(desc)") - private String defaultOrder; - - @Column(name = "BIZ_INTERCEPT") - @ApiParam("自定义业务拦截") - private String bizIntercept; - - @Transient - @ApiParam("元数据字段列表") - private List fiedList; - - @Transient - @ApiParam("自定义按钮列表") - private List btnList; - -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index da1f270..e8b6fd9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.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 com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 作业类型 @@ -40,8 +43,61 @@ public class WmsOpType extends BaseBean{ @ApiParam(value = "序号", example = "0") private Integer seq; - @Column(name="PROG_CODE") - @ApiParam("处理程序") - private String proCode; + @Column(name="TM_ID") + @ApiParam(value = "交易处理组件ID", example = "0") + private Integer tmId; + @Column(name="DATA_SRC") + @ApiParam("数据来源") + private String dataSrc; + + @Column(name="ORDER_MIN") + @ApiParam(value = "单据处理下限", example = "0") + private Integer orderMin; + + @Column(name="ORDER_MAX") + @ApiParam(value = "单据处理上限", example = "0") + private Integer orderMax; + + @Column(name="CYCLE_MINS") + @ApiParam(value = "处理周期(分钟)", example = "0") + private Integer cycleMins; + + @Column(name="LAST_TRANS_TIME") + @ApiParam(value = "末次处理时间") + public String lastTransTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="末次处理时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String lastTransTimeStr; + + @Column(name="IS_SPLIT") + @ApiParam(value = "是否拆分单据", example = "0") + private Integer isSplit; + + @Column(name="SPLIT_RULE") + @ApiParam(value = "拆分规则") + public String splitRule; + + @Column(name="IS_MERGE") + @ApiParam(value = "是否合并单据", example = "0") + private Integer isMerge; + + @Column(name="MERGE_RULE") + @ApiParam(value = "合并规则") + public String mergeRule; + + @Column(name="IS_AUTO_CLOSE") + @ApiParam(value = "任务未完是否关闭", example = "0") + private Integer isAutoClose; + + @Column(name="USE_TIME") + @ApiParam(value = "标准工时(每箱)", example = "0") + private Integer userTime; + + @Column(name="IS_MULITI") + @ApiParam(value = "是否允许多人操作", example = "0") + private Integer isMuliti; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 71c2745..ad1faae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -74,4 +74,8 @@ public class WmsPOMaster extends BaseBean { @Transient @ApiParam("供应商名称") private String vendorName; + + @Column(name="IS_TASK") + @ApiParam(value = "是否生产任务", example = "1") + public Integer isTask; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java index 6978a75..d15f505 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java @@ -40,7 +40,7 @@ public class WmsPackage extends BaseBean { @ApiParam("上级包装编号") public String parentPackageNo; - @Column(name="SN") - @ApiParam("条码") - public String sn; + @Column(name="PACKAGE_QTY") + @ApiParam(value = "包装件数", example = "1") + public Integer packageQty; } 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 2ab56fe..efb19cd 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 @@ -131,4 +131,8 @@ public class WmsStockSn extends BaseBean { @Column(name = "REF_SRC") @ApiParam(value = "关联单号") private String refSrc; + + @Column(name = "CUST_SN") + @ApiParam(value = "客户条码") + private String custSn; } 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 new file mode 100644 index 0000000..e65c004 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -0,0 +1,112 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 作业任务明细信息 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_TASK_DETAILS") +@Api("作业任务明细信息") +public class WmsTaskDetails extends BaseBean { + + @Column(name = "ORDER_NO") + @ApiParam(value = "单号") + private String orderNo; + + @Column(name = "ITEM") + @ApiParam(value = "行号", example = "1") + private Integer item; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partName; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + private String unit; + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编号") + private String custNo; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "1") + private Double qty; + + @Column(name = "TRANS_QTY") + @ApiParam(value = "处理数量", example = "1") + private Double transQty; + + @Column(name = "ZDATE") + @ApiParam(value = "计划日期") + private String zdate; + + @Column(name = "ZTIME") + @ApiParam(value = "计划时间") + private String ztime; + + @Column(name = "SRC_WH_NO") + @ApiParam(value = "源仓库代码") + private String srcWhNo; + /** + * 状态:N=正常,C=行取消 + */ + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + private Integer itemStatus; + + @Column(name = "SRC_ZONE_NO") + @ApiParam(value = "源存储区代码") + private String srcZoneNo; + + @Column(name = "SRC_LOCATE_NO") + @ApiParam(value = "源库位代码") + private String srcLocateNo; + + @Column(name = "DEST_ZONE_NO") + @ApiParam(value = "目的存储区代码") + private String destZoneNo; + + @Column(name = "DEST_LOCATE_NO") + @ApiParam(value = "目的库位代码") + private String destLocateNo; + + @Column(name = "DEST_WH_NO") + @ApiParam(value = "目的存储区代码") + private String destWhNo; + + @Column(name = "REF_TYPE") + @ApiParam(value = "关联单据类型", example = "1") + private Integer refType; + + @Column(name = "REF_SRC") + @ApiParam(value = "关联单据编号") + private String refSrc; +} 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 38a3dbb..3fef9e3 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 @@ -54,4 +54,8 @@ public class WmsTaskInfo extends BaseBean { @Column(name="TRANS_TYPE_CODE") @ApiParam("交易类型") private String transTypeCode; + + @Column(name="PRE_USE_TIME") + @ApiParam(value = "预计作业时间(分钟)", example = "1") + public Integer preUseTime; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java new file mode 100644 index 0000000..3712662 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 作业任务数据来源信息 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_TASK_SRC") +@Api("作业任务表") +public class WmsTaskSrc extends BaseBean { + + @Column(name="OP_TYPE_CODE") + @ApiParam("作业类型编号") + public String opTypeCode; + + @Column(name="ORDER_TYPE") + @ApiParam("业务类型") + public String orderType; + + @Column(name="DATA_SRC") + @ApiParam("数据来源") + public String dataSrc; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java new file mode 100644 index 0000000..ca773a2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 交易处理组件表 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2018-11-01 11:57 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_TRANS_MODULE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "交易处理组件表", description = "交易处理组件表") +public class WmsTransModule extends BaseBean { + + @Column(name = "TM_NAME") + @ApiParam(value = "组件名称") + private String tmName; + + @Column(name = "TM_DESC") + @ApiParam(value = "组件描述") + private String tmDesc; + + @Column(name = "CALL_CLASS") + @ApiParam(value = "实现类") + private String callClass; + + @Column(name = "TM_TYPE") + @ApiParam(value = "组件类型", example = "-1") + private Integer tmType; + +} 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 624d7fc..9d85d12 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 @@ -81,4 +81,24 @@ public class WmsTransQuan extends BaseBean { @Column(name = "REF_SRC") @ApiParam(value = "关联单号") public String refSrc; + + @Column(name = "TRANS_STATUS") + @ApiParam(value = "状态", example = "1") + public Integer transStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam(value = "错误信息") + public String errorMessage; + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编号") + private String custNo; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + @Column(name="MOVE_NO") + @ApiParam("移动单号") + public String moveNo; } 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 cb1f836..dc0af8b 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 @@ -71,4 +71,12 @@ public class WmsTransSn extends BaseBean { @Column(name="TRANS_NO") @ApiParam("事务编号") public Long transNo; + + @Column(name = "QC_STATUS") + @ApiParam(value = "质检状态", example = "0") + private Integer qcStatus; + + @Column(name = "SN_STATUS") + @ApiParam(value = "条码状态", example = "0") + private Integer snStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsButtonRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsButtonRepository.java deleted file mode 100644 index a8afed4..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsButtonRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsButton; - -/** - * @Description :对象持久层仓用方法控制(元数据按钮按钮信息) - * @Reference : - * @Author : hansen.ke - * @CreateDate : 2018-11-02 10:22 - * @Modify: - **/ -public interface WmsButtonRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldRepository.java deleted file mode 100644 index e550040..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsField; -import org.springframework.stereotype.Service; - -/** - * @Description : - * @Reference : - * @Author : amy - * @CreateDate : 2018-11-02 11:24 - * @Modify: - **/ -@Service -public interface WmsFieldRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsObjectRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsObjectRepository.java deleted file mode 100644 index 2d4fcc7..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsObjectRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsObject; -import org.springframework.stereotype.Service; - -/** - * @Description : - * @Reference : - * @Author : amy - * @CreateDate : 2018-11-02 11:23 - * @Modify: - **/ -@Service -public interface WmsObjectRepository extends BaseRepository { -} 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 5a789da..10255dc 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 @@ -227,7 +227,7 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result); HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result); - HqlPack.getNumEqualPack(wmsLocate.getIsEmpty(), "isEmpty", result); + HqlPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); getStringBuilderPack(wmsLocate, result); @@ -323,7 +323,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); - HqlPack.getStringEqualPack(wmsOpType.getProCode(), "proCode", result); + HqlPack.getNumEqualPack(wmsOpType.getTmId(), "tmId", result); HqlPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result); getStringBuilderPack(wmsOpType, result); @@ -799,7 +799,6 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result); HqlPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); - HqlPack.getStringEqualPack(wmsPackage.getSn(), "sn", result); HqlPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); getStringBuilderPack(wmsPackage, result); From 4154b60249ff4d51ef7d621bafbe7397575ada3a Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 4 Mar 2019 21:01:22 +0800 Subject: [PATCH 02/46] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 27 ++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) 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 f69ddf2..98afcba 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 @@ -408,6 +408,7 @@ public class CoreHqlPack { HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result); // not HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); + HqlPack.getNumNOEqualPack(dictionary.getParentId(),"parentId",result); // 添加默认排序 HqlPack.getOrderDefault(dictionary); @@ -425,9 +426,9 @@ public class CoreHqlPack { // and HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); - HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); // not HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); + HqlPack.getNumNOEqualPack(dictionary.getParentId(),"parentId",result); // 添加默认排序 HqlPack.getOrderDefault(dictionary); @@ -603,7 +604,13 @@ public class CoreHqlPack { return result.toString(); } - + /** + * 大小区间比较 + * @param columnName + * @param min + * @param max + * @return + */ public static String packHqlByInterval(String columnName,Object min,Object max){ StringBuffer result = new StringBuffer(); @@ -612,4 +619,20 @@ public class CoreHqlPack { return result.toString(); } + + + /** + * 字典信息查询id集合中是否存在默认数据 + * @param ids + * @return + */ + public static String packHqlSysDictionaryByIdsAndIsDefault(Long[] ids) { + StringBuffer result = new StringBuffer(); + + // hql拼接 + HqlPack.getInPack(StringUtils.join(ids,","),"id",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result); + + return result.toString(); + } } \ No newline at end of file From 8a78c193293545d75a9d055912e74ffd6561df03 Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 5 Mar 2019 20:10:48 +0800 Subject: [PATCH 03/46] =?UTF-8?q?=E5=BA=93=E4=BD=8D=EF=BC=8C=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=9C=8D=E5=8A=A1=E5=88=9B=E5=BB=BA?= 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 10255dc..1fd89ec 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 @@ -1237,4 +1237,21 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 根据条件查询库存条码信息 + * @param wmsStockSn + * @return + */ + public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { + StringBuffer result = new StringBuffer(); + + HqlPack.getStringEqualPack(wmsStockSn.getSn(),"sn", result); + HqlPack.getStringEqualPack(wmsStockSn.getSn2d(),"sn2d", result); + HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(),"locateNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(),"snStatus", result); + HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(),"qcStatus", result); + getStringBuilderPack(wmsStockSn, result); + return result.toString(); + } } From 380f16943fd6e66a33875bbb2d3aae74d228c1a7 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 6 Mar 2019 12:04:58 +0800 Subject: [PATCH 04/46] =?UTF-8?q?=E5=BA=93=E4=BD=8D=EF=BC=8C=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=9C=8D=E5=8A=A1=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 29 +++++++++++++++++++--- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 +++++++++-- 2 files changed, 39 insertions(+), 5 deletions(-) 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 1ef80a0..a35f07d 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 @@ -56,8 +56,31 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "TOTAL_QTY") - @ApiParam(value = "总数量", example = "0") - private Double totalQty; + @Column(name = "FAIL_QTY") + @ApiParam(value = "不合格数量", example = "0") + private Double failQty; + @Column(name = "HOLD_QTY") + @ApiParam(value = "隔离数量", example = "0") + private Double holdQty; + + @Column(name = "QC_QTY") + @ApiParam(value = "质检中数量", example = "0") + private Double qcQty; + + @Column(name = "RIN_QTY") + @ApiParam(value = "待入库数量", example = "0") + private Double rinQty; + + @Column(name = "FREEZE_QTY") + @ApiParam(value = "冻结数量", example = "0") + private Double freezeQty; + + @Column(name = "CONSIGN_QTY") + @ApiParam(value = "寄售数量", example = "0") + private Double consignQty; + + @Column(name = "LOCK_QTY") + @ApiParam(value = "锁定数量", example = "0") + private Double lockQty; } 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 1fd89ec..b4fd62a 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 @@ -1245,13 +1245,24 @@ public class WmsHqlPack { */ public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockSn.getSn(),"sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getSn2d(),"sn2d", result); HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(),"locateNo", result); HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(),"snStatus", result); HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(),"qcStatus", result); getStringBuilderPack(wmsStockSn, result); return result.toString(); } + + /** + * 根据条件查询库存信息 + * @param wmsStockQuan + * @return + */ + public static String packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(),"partNo", result); + HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(),"locateNo", result); + getStringBuilderPack(wmsStockQuan, result); + return result.toString(); + } } From 3faba3bbc26b9df7b916e587af03398ef01a5de2 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 6 Mar 2019 17:06:59 +0800 Subject: [PATCH 05/46] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-model/pom.xml | 5 ++++ .../i3plus/pojo/model/wms/ActionButlerModel.java | 28 ---------------------- .../i3plus/pojo/model/wms/WmsMoveInfoModel.java | 15 ++++++++++++ modules/i3plus-pojo-wms/pom.xml | 5 ---- .../pojo/wms/bean/WmsActionResponseBean.java | 4 +--- .../i3plus/pojo/wms/bean/WmsOperationBean.java | 2 -- .../i3plus/pojo/wms/bean/WmsOptionModel.java} | 4 ++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++++ 8 files changed, 27 insertions(+), 40 deletions(-) delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java => i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java} (89%) diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 24763f0..e975c42 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -29,6 +29,11 @@ i3plus-pojo-report + + i3plus.pojo + i3plus-pojo-wms + + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java deleted file mode 100644 index fdf6c5f..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.estsh.i3plus.pojo.model.wms; - -import lombok.Data; - -/** - * @Description : 流程管家模型 - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2018-11-28 15:50 - * @Modify: - **/ -@Data -public class ActionButlerModel { - - private String orderNo; - - private String sn; - - private String aLId; - - private String userNo; - - private String fixNo; - - private String barCode; - - private String funCallName; -} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java new file mode 100644 index 0000000..46f72e4 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +/** + * @Description : 库存移动单模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsMoveInfoModel { + +} diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 7409467..db2f77a 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -16,11 +16,6 @@ i3plus.pojo - i3plus-pojo-model - - - - i3plus.pojo i3plus-pojo-base diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index d87e915..ce8cd86 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -1,7 +1,5 @@ package cn.estsh.i3plus.pojo.wms.bean; -import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; -import cn.estsh.i3plus.pojo.model.wms.OptionModel; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -45,7 +43,7 @@ public class WmsActionResponseBean { public List informations; @ApiParam("可选项") - public List options; + public List options; @ApiParam("选中的明细数据") public Obj details; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java index 1fbbbf4..b572de7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -1,13 +1,11 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.model.wms.OptionModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; -import java.util.Map; /** * @Description : PDA传输到后台的实体bean对象 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java similarity index 89% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java index 7ab343e..fa5063d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.model.wms; +package cn.estsh.i3plus.pojo.wms.bean; import lombok.Data; @@ -10,7 +10,7 @@ import lombok.Data; * @Modify: **/ @Data -public class OptionModel { +public class WmsOptionModel { private String code; 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 c019a19..48154b2 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 @@ -106,4 +106,8 @@ public class WmsPart extends BaseBean { @Column(name="LOT_CHECK_RULE") @ApiParam(value ="批次校验规则") private String lotCheckRule; + + @Column(name="IN_LOCATE_NO") + @ApiParam(value ="默认入库库位") + private String inLocateNo; } From e80d4769025ffb971cacc83219e11d727a67bcfe Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 6 Mar 2019 17:23:55 +0800 Subject: [PATCH 06/46] =?UTF-8?q?=E8=B0=83=E6=95=B4model=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsMoveInfoModel.java | 15 ------------- .../i3plus/pojo/model/wms/WmsMoveMasterModel.java | 25 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 15 deletions(-) delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java deleted file mode 100644 index 46f72e4..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.model.wms; - -import lombok.Data; - -/** - * @Description : 库存移动单模型 - * @Reference : - * @Author : siliter.yuan - * @CreateDate : 2019-03-06 15:50 - * @Modify: - **/ -@Data -public class WmsMoveInfoModel { - -} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java new file mode 100644 index 0000000..5c7bddf --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.util.List; + +/** + * @Description : 库存移动单模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsMoveMasterModel { + public String orderNo; + + public Integer orderStatus; + + public String reMark; + + private String transTypeCode; + + private List moveDetails; +} From b0d34a04b48976b2e8c796fc964fd251e848ed53 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 6 Mar 2019 17:24:44 +0800 Subject: [PATCH 07/46] =?UTF-8?q?=E8=B0=83=E6=95=B4model=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsMoveDetailsModel.java | 59 ++++++++++++++++++++++ .../i3plus/pojo/model/wms/WmsMoveSnModel.java | 42 +++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java new file mode 100644 index 0000000..d885242 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.util.List; + +/** + * @Description : 库存移动明细模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsMoveDetailsModel { + public String orderNo; + + public Integer item; + + public String partNo; + + public String partNameRdd; + + public String vendorNo; + + public String custNo; + + public Double qty; + + public Double transQty; + + public String unit; + + public String srcWhNo; + + public String srcZoneNo; + + public String srcLocateNo; + + public String destWhNo; + + public String destZoneNo; + + public String destLocateNo; + + /** + * 状态:1=创建,10=待处理,20=已处理 + */ + public Integer itemStatus; + + /** + * ASN,PO,SO + */ + public Integer refType; + + public String refSrc; + + private List moveDetails; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java new file mode 100644 index 0000000..5d44741 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +/** + * @Description : 库存移动条码模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsMoveSnModel { + public String orderNo; + + public Integer item; + + public String partNo; + + public String partNameRdd; + + public String unit; + + public String sn; + + /** + * 状态:1=创建,10=待处理,20=已处理 + */ + public Integer itemStatus; + + public String reMark; + + public String lotNo; + + public String packAgeNo; + + public Double qty; + + public String srcLocateNo; + + public String destLocateNo; +} From 8e029e82e0696e4221c45555e1f7256dde09a0b1 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 6 Mar 2019 20:01:14 +0800 Subject: [PATCH 08/46] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=20=E9=82=AE=E4=BB=B6=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 34 ++++++++++++++++++++++ .../estsh/i3plus/pojo/platform/bean/SysConfig.java | 4 +++ .../i3plus/pojo/platform/bean/SysMessage.java | 6 +++- 3 files changed, 43 insertions(+), 1 deletion(-) 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 0d0e9c0..4d003e2 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 @@ -1047,4 +1047,38 @@ public class ImppEnumUtil { return tmp; } } + + //messageReceiverType + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MESSAGE_RECEIVER_TYPE { + INTERNAL(1, "内部人员接收"), + EXTERNAL(2, "外部人员接收"), + URGENT(3, "紧急联系人接收"); + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private MESSAGE_RECEIVER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + 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; + } + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 32d44bc..85501de 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -55,6 +55,10 @@ public class SysConfig extends BaseBean { @ApiParam(value ="参数值") private String configValue; + @Column(name="CONFIG_VALUE_OPTION") + @ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{key:'',value:''}") + private String configValueOption; + @Column(name="CONFIG_DESCRIPTION") @ApiParam(value ="参数描述") private String configDescription; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index be4d80c..978c2d1 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -55,8 +55,12 @@ public class SysMessage extends BaseBean { @ApiParam(value ="发送者名称" ) private String messageSenderNameRdd; + @Column(name="MESSAGE_RECEIVER_TYPE") + @ApiParam(value ="收件人类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1") + private Integer messageReceiverType; + @Column(name="MESSAGE_RECEIVERS_ID") - @ApiParam(value ="发送者id" ) + @ApiParam(value ="收件者id" ) private String messageReceiversId; @Column(name="MESSAGE_RECEIVERS_NAME_RDD") From 268f86b602cac55472575d80c5efe6e8f0ccd75a Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Wed, 6 Mar 2019 20:25:14 +0800 Subject: [PATCH 09/46] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A1=A8=E5=AE=9E=E4=BD=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 0a7d5f2..964f4c8 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 @@ -72,9 +72,9 @@ public class WmsMoveSn extends BaseBean { @ApiParam("容器编号") public String packAgeNo; - @Column(name="QTY") - @ApiParam(value = "已收数量", example = "0") - public Double qty; + @Column(name="SRC_QTY") + @ApiParam(value = "源数量", example = "0") + public Double srcQty; @Column(name="SRC_LOCATE_NO") @ApiParam("源库位代码") @@ -92,6 +92,10 @@ public class WmsMoveSn extends BaseBean { @Transient private Long finishedCounts; + @Column(name="DEST_QTY") + @ApiParam(value = "目标数量", example = "0") + public Double destQty; + public WmsMoveSn(){} public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ From 5b7f23ca8231479090e2f06ffe8c7c44f4dd215f Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Wed, 6 Mar 2019 20:32:45 +0800 Subject: [PATCH 10/46] =?UTF-8?q?=E6=8B=86=E5=88=86=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 4 ++++ 1 file changed, 4 insertions(+) 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 964f4c8..f1016d5 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 @@ -96,6 +96,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam(value = "目标数量", example = "0") public Double destQty; + @Column(name="QTY") + @ApiParam(value = "数量", example = "0") + public Double qty; + public WmsMoveSn(){} public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ From 1aa8f7fd1a4c8976b7316403144b5827a17214dc Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 6 Mar 2019 21:34:07 +0800 Subject: [PATCH 11/46] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 105 ++++++++++++- modules/i3plus-pojo-wms/pom.xml | 4 + .../estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 24 +-- .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 3 + .../i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 23 ++- .../pojo/wms/bean/WmsDocMovementDetails.java | 32 +++- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 9 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 11 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java | 44 +++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 20 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java | 26 +++- .../pojo/wms/repository/WmsOpTypeRepository.java | 2 +- .../wms/repository/WmsTaskDetailsRepository.java | 17 ++ .../pojo/wms/repository/WmsTaskSrcRepository.java | 17 ++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 171 +++++++++++++++------ 16 files changed, 389 insertions(+), 123 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 22163ea..3bef53e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -11,6 +11,55 @@ import com.fasterxml.jackson.annotation.JsonFormat; **/ public class WmsEnumUtil { /** + * 拆分规则 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SPLIT_OR_MERGE_RULE { + WH(10, "WH", "仓库"), ZONE(20, "ZONE", "存储区"), PART(30, "PART", "物料"); + private int value; + private String code; + private String description; + + SPLIT_OR_MERGE_RULE(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) @@ -710,9 +759,14 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE { - ASN(1, "ASN"), - PO(10, "PO"), - SO(20, "SO"); + ASN(10, "ASN"), + PO(20, "PO"), + SO(30, "SO"), + MOVE(40, "MOVE"), + IN_STOCK(50, "IN_STOCK"), + SHIPPING(60, "SHIPPING"), + QC(70, "QC"), + CS(80, "CS"); private int value; private String description; @@ -776,6 +830,40 @@ public class WmsEnumUtil { } /** + * 单据是否生成任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_GENERAL_TASK { + CREATE(10, "创建"), INIT(20, "初始化"), IS_GENERAL(30, "已生成"), NO_GENERAL(40, "不生成"); + + private int value; + private String description; + + IS_GENERAL_TASK(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** * 业务表：库存条码状态 * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 */ @@ -992,7 +1080,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CS_ITEM_STATUS { - CREATE(1, "创建"),FINISH(10, "已处理"); + CREATE(1, "创建"), FINISH(10, "已处理"); private int value; private String description; @@ -1174,9 +1262,9 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALD_EXECUTE_STATUS { - NORMAL(1, "创建"), - PROCESSING(10, "处理中"), - COMPLETED(20, "已完成"); + NORMAL(10, "创建"), + PROCESSING(20, "处理中"), + COMPLETED(30, "已完成"); private int value; private String description; @@ -1497,9 +1585,10 @@ public class WmsEnumUtil { return tmp; } } + /** * 流程明细动作类型 - * 10=交互动作,20=后台动作,30=提交动作 + * 10=交互动作,20=后台动作,30=提交动作 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_VALUE_TYPE { diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 7409467..31ca821 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -23,6 +23,10 @@ i3plus.pojo i3plus-pojo-base + + i3plus.platform + i3plus-platform-common + diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index d18a25a..8c4d440 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -7,10 +7,12 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description : ASN订单主表 @@ -24,11 +26,11 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_ASN_MASTER") +@Table(name = "WMS_DOC_ASN_MASTER") @Api("ASN主表信息") public class WmsASNMaster extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("订单号") public String orderNo; @@ -36,7 +38,7 @@ public class WmsASNMaster extends BaseBean { * 单据类型:REG=原物料采购, * SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购 */ - @Column(name="ASN_TYPE") + @Column(name = "ASN_TYPE") @ApiParam("单据类型") public String asnType; @@ -44,23 +46,23 @@ public class WmsASNMaster extends BaseBean { * 状态:1=新建,10=收货中,20=收货完成, * 30=入库中,40=入库完成,90=已关闭,91=已取消 */ - @Column(name="ASN_STATUS") + @Column(name = "ASN_STATUS") @ApiParam(value = "状态", example = "0") public Integer asnStatus; - @Column(name="VENDOR_NO") + @Column(name = "VENDOR_NO") @ApiParam("供应商编号") public String vendorNo; - @Column(name="VERSION") + @Column(name = "VERSION") @ApiParam("版本") public String version; - @Column(name="SRC") + @Column(name = "SRC") @ApiParam("单据来源") public String src; - @Column(name="PO_NO") + @Column(name = "PO_NO") @ApiParam("PO单号") public String poNo; @@ -68,7 +70,11 @@ public class WmsASNMaster extends BaseBean { @ApiParam("集装箱号") public String containerNo; - @Column(name="IS_TASK") + @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") public Integer isTask; + + @Transient + @ApiParam(value = "单据明细集合") + public List wmsASNMasterDetailsList; } 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 905b851..b5934c9 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 @@ -7,10 +7,12 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description : ASN订单明细信息 @@ -109,4 +111,5 @@ public class WmsASNMasterDetails extends BaseBean { @Column(name="REC_QTY") @ApiParam(value = "已收数量", example = "0") public Double recQty; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index 5a09848..e568fc1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -7,10 +7,12 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description : 盘点单主表信息 @@ -24,11 +26,11 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_CS_ORDER") +@Table(name = "WMS_DOC_CS_ORDER") @Api("盘点单主表信息") public class WmsCSOrderMaster extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; @@ -36,23 +38,28 @@ public class WmsCSOrderMaster extends BaseBean { * 单据类型:10=日常盘点,20=月度盘点, * 30=季度盘点,40=年度盘点 */ - @Column(name="ORDER_TYPE") + @Column(name = "ORDER_TYPE") @ApiParam(value = "单据类型", example = "10") public Integer orderType; - @Column(name="ORDER_STATUS") - @ApiParam(value = "状态 (1-创建 10-已冻结 20-盘点中 30-盘点完成 40-已解冻 50-已关闭)", example = "1" ) + @Column(name = "ORDER_STATUS") + @ApiParam(value = "状态 (1-创建 10-已冻结 20-盘点中 30-盘点完成 40-已解冻 50-已关闭)", example = "1") public Integer orderStatus; - @Column(name="ACTION_PERSENT") + @Column(name = "ACTION_PERSENT") @ApiParam("盘点进度") public String actionPersent; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String reMark; - @Column(name="IS_INVENTORY") + @Column(name = "IS_INVENTORY") @ApiParam(value = "是否允许清点", example = "1") public Integer isInventory; + + @Transient + @ApiParam(value = "盘点明细集") + public List wmsCSOrderDetailsList; + } 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 ea58ba7..f870b57 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 @@ -13,7 +13,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description :移库单详情实体(用于转储类业务) + * @Description :移库单明细实体(用于转储类业务) * @Reference : * @Author : dragon.xu * @CreateDate : 2018-11-13 16:06 @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_DOC_MOVEMENT_DETAILS") -@Api("移库单详情表") +@Api("移库单明细表") public class WmsDocMovementDetails extends BaseBean { @Column(name = "ORDER_NO") @ApiParam(value = "单号") @@ -47,13 +47,29 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "SRC_WH") - @ApiParam(value = "发出库仓库") - private String srcWh; + @Column(name = "SRC_WH_NO") + @ApiParam("源仓库代码") + public String srcWhNo; - @Column(name = "DEST_WH") - @ApiParam(value = "接收库仓库") - private String destWh; + @Column(name = "SRC_ZONE_NO") + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Column(name = "SRC_LOCATE_NO") + @ApiParam("源库位代码") + public String srcLocateNo; + + @Column(name = "DEST_WH_NO") + @ApiParam("目标仓库代码") + public String destWhNo; + + @Column(name = "DEST_ZONE_NO") + @ApiParam("目标存储区代码") + public String destZoneNo; + + @Column(name = "DEST_LOCATE_NO") + @ApiParam("目标库位代码") + public String destLocateNo; @Column(name = "QTY") @ApiParam(value = "需求数量", example = "1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index e7d4099..c6759da 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -7,10 +7,12 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :移库单实体(用于转储类业务) @@ -99,12 +101,15 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "数量", example = "1") private Double qty; - @Column(name="IS_TASK") + @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") public Integer isTask; - @Column(name="PRIORITY") + @Column(name = "PRIORITY") @ApiParam(value = "优先级", example = "1") public Integer priority; + @Transient + @ApiParam(value = "移库单明细集合") + private List wmsDocMovementDetailsList; } 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 e113047..7e3ca01 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 @@ -66,11 +66,11 @@ public class WmsMoveDetails extends BaseBean { public String unit; @Column(name="SRC_WH_NO") - @ApiParam("仓库代码") + @ApiParam("源仓库代码") public String srcWhNo; @Column(name="SRC_ZONE_NO") - @ApiParam("存储区代码") + @ApiParam("源存储区代码") public String srcZoneNo; @Column(name="SRC_LOCATE_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 3268ddd..bd1aa1f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -7,10 +7,12 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description : 库存移动单主表信息 @@ -24,26 +26,27 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_MOVE_MASTER") +@Table(name = "WMS_MOVE_MASTER") @Api("库存移动单主表信息") public class WmsMoveMaster extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; /** * 状态:1=创建,10=待处理,20=已处理 */ - @Column(name="ORDER_STATUS") + @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "0") public Integer orderStatus; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String reMark; @Column(name = "TRANS_TYPE_CODE") @ApiParam(value = "交易类型代码") private String transTypeCode; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index e8b6fd9..e123665 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -9,11 +9,13 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; +import java.util.List; +import java.util.Map; /** * @Description : 作业类型 @@ -27,15 +29,15 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_OP_TYPE") +@Table(name = "WMS_OP_TYPE") @Api("作业类型") -public class WmsOpType extends BaseBean{ +public class WmsOpType extends BaseBean { - @Column(name="OP_TYPE_CODE") + @Column(name = "OP_TYPE_CODE") @ApiParam("类型编号") private String opTypeCode; - @Column(name="OP_TYPE_NAME") + @Column(name = "OP_TYPE_NAME") @ApiParam("类型名称") private String opTypeName; @@ -43,61 +45,65 @@ public class WmsOpType extends BaseBean{ @ApiParam(value = "序号", example = "0") private Integer seq; - @Column(name="TM_ID") + @Column(name = "TM_ID") @ApiParam(value = "交易处理组件ID", example = "0") private Integer tmId; - @Column(name="DATA_SRC") + @Column(name = "DATA_SRC") @ApiParam("数据来源") private String dataSrc; - @Column(name="ORDER_MIN") + @Column(name = "ORDER_MIN") @ApiParam(value = "单据处理下限", example = "0") private Integer orderMin; - @Column(name="ORDER_MAX") + @Column(name = "ORDER_MAX") @ApiParam(value = "单据处理上限", example = "0") private Integer orderMax; - @Column(name="CYCLE_MINS") + @Column(name = "CYCLE_MINS") @ApiParam(value = "处理周期(分钟)", example = "0") private Integer cycleMins; - @Column(name="LAST_TRANS_TIME") + @Column(name = "LAST_TRANS_TIME") @ApiParam(value = "末次处理时间") public String lastTransTime; @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="末次处理时间",example = "2018-01-01 01:00:00") + @ApiParam(value = "末次处理时间", example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) public String lastTransTimeStr; - @Column(name="IS_SPLIT") + @Column(name = "IS_SPLIT") @ApiParam(value = "是否拆分单据", example = "0") private Integer isSplit; - @Column(name="SPLIT_RULE") + @Column(name = "SPLIT_RULE") @ApiParam(value = "拆分规则") public String splitRule; - @Column(name="IS_MERGE") + @Column(name = "IS_MERGE") @ApiParam(value = "是否合并单据", example = "0") private Integer isMerge; - @Column(name="MERGE_RULE") + @Column(name = "MERGE_RULE") @ApiParam(value = "合并规则") public String mergeRule; - @Column(name="IS_AUTO_CLOSE") + @Column(name = "IS_AUTO_CLOSE") @ApiParam(value = "任务未完是否关闭", example = "0") private Integer isAutoClose; - @Column(name="USE_TIME") + @Column(name = "USE_TIME") @ApiParam(value = "标准工时(每箱)", example = "0") private Integer userTime; - @Column(name="IS_MULITI") + @Column(name = "IS_MULITI") @ApiParam(value = "是否允许多人操作", example = "0") private Integer isMuliti; + + @Transient + @ApiParam(value = "单据集") + private List> orderList; } 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 3fef9e3..8d645ee 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 @@ -24,38 +24,42 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_TASK") +@Table(name = "WMS_TASK") @Api("作业任务表") public class WmsTaskInfo extends BaseBean { - @Column(name="MOVE_NO") + @Column(name = "ORDER_NO") + @ApiParam("单号") + public String orderNo; + + @Column(name = "MOVE_NO") @ApiParam("移动单号") public String moveNo; - @Column(name="USER_NO") + @Column(name = "USER_NO") @ApiParam("作业人员") public String userNo; - @Column(name="OP_TYPE_CODE") + @Column(name = "OP_TYPE_CODE") @ApiParam("作业类型") public String opTypeCode; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String reMark; /** * 状态:1=创建,10=待处理,20=已处理 */ - @Column(name="TASK_STATUS") + @Column(name = "TASK_STATUS") @ApiParam(value = "任务状态", example = "1") public Integer taskStatus; - @Column(name="TRANS_TYPE_CODE") + @Column(name = "TRANS_TYPE_CODE") @ApiParam("交易类型") private String transTypeCode; - @Column(name="PRE_USE_TIME") + @Column(name = "PRE_USE_TIME") @ApiParam(value = "预计作业时间(分钟)", example = "1") public Integer preUseTime; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java index 3712662..c09c576 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java @@ -24,19 +24,31 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_TASK_SRC") +@Table(name = "WMS_TASK_SRC") @Api("作业任务表") public class WmsTaskSrc extends BaseBean { - @Column(name="OP_TYPE_CODE") + @Column(name = "OP_TYPE_CODE") @ApiParam("作业类型编号") public String opTypeCode; - @Column(name="ORDER_TYPE") - @ApiParam("业务类型") - public String orderType; - - @Column(name="DATA_SRC") + @Column(name = "DATA_SRC") @ApiParam("数据来源") public String dataSrc; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + public String busiType; + + @Column(name = "PRIORITY") + @ApiParam("优先级") + public String priority; + + @Column(name = "IS_SN") + @ApiParam("是否有条码") + public String isSn; + + @Column(name = "TRANS_CODE") + @ApiParam("默认交易类型") + public String transCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.java index 59aad4c..01541f7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.java @@ -5,7 +5,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsOpType; import org.springframework.stereotype.Repository; /** - * @Description : 作业类型 + * @Description : 作业类型DAO层 * @Reference : * @Author : amy * @CreateDate : 2018-11-07 14:46 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskDetailsRepository.java new file mode 100644 index 0000000..1c116f4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskDetailsRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTaskDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsTaskInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层公用方法控制(作业任务明细信息) + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-03-06 17:16 + * @Modify: + **/ +@Repository +public interface WmsTaskDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java new file mode 100644 index 0000000..c248080 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsOpType; +import cn.estsh.i3plus.pojo.wms.bean.WmsTaskSrc; +import org.springframework.stereotype.Repository; + +/** + * @Description : 作业任务数据来源DAO层 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-03-06 14:41 + * @Modify: + **/ +@Repository +public interface WmsTaskSrcRepository extends BaseRepository { +} 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 1fd89ec..28155ba 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 @@ -1,11 +1,17 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; +import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; + +import java.util.Date; +import java.util.List; /** * @Description : 仓库管理对象封装 @@ -18,7 +24,8 @@ public class WmsHqlPack { /** * 封装公用查询参数 - * @param bean 实体对象 + * + * @param bean 实体对象 * @param hqlStr 查询语句 * @return 封装完成的查询语句 */ @@ -59,7 +66,7 @@ public class WmsHqlPack { } /** - * 库存移动单详情查询封装 + * 库存移库单明细查询封装 * * @param wmsDocMovementDetails * @return @@ -76,6 +83,28 @@ public class WmsHqlPack { } /** + * 查询任务合并的移库单明细 查询条件封装 + * + * @param orderNos + * @return + */ + public static String packHqlWmsDocMovementDetailsByOrderNos(List orderNos) { + StringBuffer result = new StringBuffer(); + StringBuffer orderNoStr = new StringBuffer(); + for (int i = 0; i < orderNos.size(); i++) { + if (i == orderNos.size()) { + orderNoStr.append("'" + orderNos.get(i) + "'"); + } else { + orderNoStr.append("'" + orderNos.get(i) + "',"); + } + } + result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() + + "and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() + + "and model.orderNo in (" + orderNos + ")" + " order by model.partNo,model.orderNo"); + return result.toString(); + } + + /** * 库存移动单查询封装 * * @param wmsDocMovementMaster @@ -183,10 +212,10 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsIbCheckPlan, result); - if(wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) { + if (wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) { HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); } - if(wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) { + if (wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) { HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); } @@ -373,8 +402,38 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); + getStringBuilderPack(wmsOpType, result); + + return result.toString(); + } + + /** + * 查询满足处理周期的作业类型 查询条件封装 + * + * @param wmsOpType + * @return + */ + public static String packHqlWmsOpTypeTime(WmsOpType wmsOpType) { + StringBuffer result = new StringBuffer(); getStringBuilderPack(wmsOpType, result); + result.append(" and isnull(model.lastTransTime) or timestampdiff(Minute,nvl(model.lastTransTime,'2000'),now()) >= model.cycleMins"); + return result.toString(); + } + + /** + * 作业任务数据来源 查询条件封装 + * + * @param wmsTaskSrc + * @return + */ + public static String packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) { + StringBuffer result = new StringBuffer(); + + //作业类型代码 + HqlPack.getStringLikerPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result); + + getStringBuilderPack(wmsTaskSrc, result); return result.toString(); } @@ -395,7 +454,7 @@ public class WmsHqlPack { //存储区代码 HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); //存储区名称 - HqlPack.getStringLikerPack(wmsZones.getZoneName(),"zoneName", result); + HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); getStringBuilderPack(wmsZones, result); @@ -461,7 +520,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); HqlPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); - getStringBuilderPack(wmsASNMaster,result); + getStringBuilderPack(wmsASNMaster, result); return result.toString(); } @@ -540,7 +599,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); - getStringBuilderPack(wmsASNMasterDetails,result); + getStringBuilderPack(wmsASNMasterDetails, result); return result.toString(); } @@ -598,6 +657,7 @@ public class WmsHqlPack { /** * 根据条件查询打印机队列信息封装类 + * * @param wmsSnPrint 打印机队列信息 * @return 打印机队列信息 */ @@ -620,10 +680,11 @@ public class WmsHqlPack { /** * 盘点库位 条件封装 + * * @param wmsCSLocate * @return */ - public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate){ + public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result); @@ -636,15 +697,16 @@ public class WmsHqlPack { /** * 盘点物料 条件封装 + * * @param wmsCSPart * @return */ - public static String packHqlWmsCSPart(WmsCSPart wmsCSPart){ + public static String packHqlWmsCSPart(WmsCSPart wmsCSPart) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(),"orderNo", result); - HqlPack.getStringEqualPack(wmsCSPart.getPartNo(),"partNo", result); - HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(),"partNameRdd", result); + HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsCSPart, result); @@ -653,10 +715,11 @@ public class WmsHqlPack { /** * 盘点存储区 条件封装 + * * @param wmsCSZone * @return */ - public static String packHqlWmsCSZone(WmsCSZone wmsCSZone){ + public static String packHqlWmsCSZone(WmsCSZone wmsCSZone) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result); @@ -669,6 +732,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsAreaOwner 责任区分配信息 * @return 责任区分配信息 */ @@ -695,6 +759,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsTempOrderLock 责任区分配信息 * @return 责任区分配信息 */ @@ -805,16 +870,18 @@ public class WmsHqlPack { return result.toString(); } + /** - *内部单据：库存移动单主表唯一性查询 + * 内部单据：库存移动单主表唯一性查询 + * * @param wmsMoveMaster * @return */ - public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster){ + public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result); + HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); getStringBuilderPack(wmsMoveMaster, result); @@ -823,14 +890,15 @@ public class WmsHqlPack { /** * 内部单据：库存移动单主表分页查询 + * * @param wmsMoveMaster * @return */ - public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster){ + public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); + HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); HqlPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); getStringBuilderPack(wmsMoveMaster, result); @@ -839,10 +907,11 @@ public class WmsHqlPack { /** * 内部单据：库存移动单明细表分页查询 + * * @param wmsMoveDetails * @return */ - public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails){ + public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result); @@ -852,15 +921,15 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result); HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(),"srcWhNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(),"destWhNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(),"srcZoneNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(),"destZoneNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(),"srcLocateNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(),"destLocateNo",result); - HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result); - HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result); - HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", result); + HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", result); + HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", result); getStringBuilderPack(wmsMoveDetails, result); @@ -869,10 +938,11 @@ public class WmsHqlPack { /** * 内部单据：库存移动单条码信息分页查询 + * * @param wmsMoveSn * @return */ - public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn){ + public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); @@ -1092,9 +1162,10 @@ public class WmsHqlPack { /** * 作业流程分页查询 + * * @return */ - public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup){ + public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) { StringBuffer result = new StringBuffer(); //查询参数封装 agDescC;agNameC @@ -1107,9 +1178,10 @@ public class WmsHqlPack { /** * 作业流程明细分页查询 + * * @return */ - public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails){ + public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) { StringBuffer result = new StringBuffer(); //查询参数封装 @@ -1156,6 +1228,7 @@ public class WmsHqlPack { /** * 作业记录 查询条件封装 + * * @param wmsActionLog * @return */ @@ -1163,19 +1236,19 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(), + HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(), "startTime", result, true); } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(), + HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(), "endTime", result, true); } // 作业流程编号 - HqlPack.getNumEqualPack(wmsActionLog.getAgId(),"agId",result); + HqlPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result); // 作业流程名称 - HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(),"agNameC",result); + HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); // 单据编号 - HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(),"orderNo",result); + HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsActionLog, result); @@ -1184,15 +1257,16 @@ public class WmsHqlPack { /** * 作业记录明细 查询条件封装 + * * @param wmsActionLogDetails * @return */ - public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails){ + public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) { StringBuffer result = new StringBuffer(); //作业流程id（对应作业记录明细里自增的id） - HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(),"seq",result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result); HqlPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result); HqlPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result); HqlPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result); @@ -1224,14 +1298,15 @@ public class WmsHqlPack { } /** - * 按moveNo 取最后一笔插入的数据 + * 按moveNo 取最后一笔插入的数据 + * * @param wmsMoveSn * @return */ public static String packHqlLastWmsMoveSn(WmsMoveSn wmsMoveSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(),"orderNo", result); + HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsMoveSn, result); HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); @@ -1239,19 +1314,21 @@ public class WmsHqlPack { } /** - * 根据条件查询库存条码信息 + * 根据条件查询库存条码信息 + * * @param wmsStockSn * @return */ public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockSn.getSn(),"sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getSn2d(),"sn2d", result); - HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(),"locateNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(),"snStatus", result); - HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(),"qcStatus", result); + HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); + HqlPack.getStringEqualPack(wmsStockSn.getSn2d(), "sn2d", result); + HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); getStringBuilderPack(wmsStockSn, result); + return result.toString(); } } From 4ccdf4c77467c82f78d8f176bc99f30fc25132ad Mon Sep 17 00:00:00 2001 From: "Rock.Yu" Date: Wed, 6 Mar 2019 22:05:08 +0800 Subject: [PATCH 12/46] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=8A=B6=E6=80=81=E6=A3=80=E6=9F=A5=E7=9A=84=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/rules/WmsSNCheckRule.java | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNCheckRule.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNCheckRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNCheckRule.java new file mode 100644 index 0000000..7ddb183 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNCheckRule.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.wms.rules; + +/** + * @Description : 纯POJO，WMS PDA 操作前的条码状态检查 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2019-03-06 19:26 + * @Modify: + **/ +public class WmsSNCheckRule { + // 交易类型代码 + private int transTypeCode; + // 业务类型代码 + private int busiTypeCode; + // 条码状态代码 + private int snStatusCode; + // 质量状态代码 + private int qcStatusCode; + // 匹配结果，默认为匹配失败 + private boolean result = false; + + public int getTransTypeCode() { + return transTypeCode; + } + + public void setTransTypeCode(int transTypeCode) { + this.transTypeCode = transTypeCode; + } + + public int getBusiTypeCode() { + return busiTypeCode; + } + + public void setBusiTypeCode(int busiTypeCode) { + this.busiTypeCode = busiTypeCode; + } + + public int getSnStatusCode() { + return snStatusCode; + } + + public void setSnStatusCode(int snStatusCode) { + this.snStatusCode = snStatusCode; + } + + public int getQcStatusCode() { + return qcStatusCode; + } + + public void setQcStatusCode(int qcStatusCode) { + this.qcStatusCode = qcStatusCode; + } + + public boolean isResult() { + return result; + } + + public void setResult(boolean result) { + this.result = result; + } +} \ No newline at end of file From 933654a86a3182e4aac6ae77a0b950eee2933bd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Thu, 7 Mar 2019 09:17:39 +0800 Subject: [PATCH 13/46] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E7=8A=B6=E6=80=81=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/WmsEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 3bef53e..e5ac171 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -500,6 +500,40 @@ public class WmsEnumUtil { } /** + * 库位状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOCATE_STATUS { + CREATE(10, "空库位"), FINISH(20, "非空"), FAIL(30, "已满"); + + private int value; + private String description; + + LOCATE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** * 外部单据：移库单移动类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From ba90dfb1231712318f480b643aef4f1d6b08c49e Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 7 Mar 2019 09:28:25 +0800 Subject: [PATCH 14/46] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=BB=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 +- .../i3plus/pojo/model/wms/WmsMoveDetailsModel.java | 50 +++------------------- .../i3plus/pojo/model/wms/WmsMoveMasterModel.java | 13 ++---- .../i3plus/pojo/model/wms/WmsMoveSnModel.java | 42 ------------------ .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 12 ++++++ .../estsh/i3plus/pojo/wms/bean/WmsTransType.java | 13 ++++++ .../wms/repository/WmsTransModuleRepository.java | 16 +++++++ 7 files changed, 52 insertions(+), 98 deletions(-) delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransModuleRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 22163ea..e6ae28c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -205,7 +205,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_STATUS { - CREATE(10, "新建"), + CREATE(1, "新建"), RECEIPT(10, "收货中"), RECEIPT_FINISH(20, "收货完成"), WAREHOUSING(30, "入库中"), @@ -1664,6 +1664,4 @@ public class WmsEnumUtil { return description; } } - - } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java index d885242..30fe13b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -1,7 +1,10 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -12,48 +15,7 @@ import java.util.List; * @Modify: **/ @Data -public class WmsMoveDetailsModel { - public String orderNo; - - public Integer item; - - public String partNo; - - public String partNameRdd; - - public String vendorNo; - - public String custNo; - - public Double qty; - - public Double transQty; - - public String unit; - - public String srcWhNo; - - public String srcZoneNo; - - public String srcLocateNo; - - public String destWhNo; - - public String destZoneNo; - - public String destLocateNo; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - public Integer itemStatus; - - /** - * ASN,PO,SO - */ - public Integer refType; - - public String refSrc; - - private List moveDetails; +public class WmsMoveDetailsModel implements Serializable { + private WmsMoveDetails details; + private List moveSn; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java index 5c7bddf..a4b54c4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMaster; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -12,14 +14,7 @@ import java.util.List; * @Modify: **/ @Data -public class WmsMoveMasterModel { - public String orderNo; - - public Integer orderStatus; - - public String reMark; - - private String transTypeCode; - +public class WmsMoveMasterModel implements Serializable { + private WmsMoveMaster moveMaster; private List moveDetails; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java deleted file mode 100644 index 5d44741..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.estsh.i3plus.pojo.model.wms; - -import lombok.Data; - -/** - * @Description : 库存移动条码模型 - * @Reference : - * @Author : siliter.yuan - * @CreateDate : 2019-03-06 15:50 - * @Modify: - **/ -@Data -public class WmsMoveSnModel { - public String orderNo; - - public Integer item; - - public String partNo; - - public String partNameRdd; - - public String unit; - - public String sn; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - public Integer itemStatus; - - public String reMark; - - public String lotNo; - - public String packAgeNo; - - public Double qty; - - public String srcLocateNo; - - public String destLocateNo; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 3268ddd..285395a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -46,4 +46,16 @@ public class WmsMoveMaster extends BaseBean { @Column(name = "TRANS_TYPE_CODE") @ApiParam(value = "交易类型代码") private String transTypeCode; + + @Column(name = "ERROR_MESSAGE") + @ApiParam(value = "错误信息") + private String errorMessage; + + @Column(name="IS_URGENT") + @ApiParam(value = "是否紧急", example = "0") + public Integer isUrgent; + + @Column(name = "CAR_NO") + @ApiParam(value = "车牌号") + private String carNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index a9dde28..9c4aa2c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -52,4 +52,17 @@ public class WmsTransType extends BaseBean { @ApiParam("中文流程名称") private String agNameC; + @Column(name = "TRANS_TYPE_DESC") + @ApiParam(value = "类型说明") + private String transTypeDesc; + + @Column(name = "TM_ID") + @ApiParam(value = "交易处理组件", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long tmId; + + @Column(name = "OP_TYPE_ID") + @ApiParam(value = "作业类型编号", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long opTypeId; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransModuleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransModuleRepository.java new file mode 100644 index 0000000..a94b4f4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransModuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransModule; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-06 9:47 + * @Modify: + **/ +@Repository +public interface WmsTransModuleRepository extends BaseRepository { +} From e9a04ec9601dd4af30ace9eae78e0b562e6bf6a6 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 7 Mar 2019 09:31:49 +0800 Subject: [PATCH 15/46] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 285395a..7910609 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -24,22 +24,22 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_MOVE_MASTER") +@Table(name = "WMS_MOVE_MASTER") @Api("库存移动单主表信息") public class WmsMoveMaster extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; /** * 状态:1=创建,10=待处理,20=已处理 */ - @Column(name="ORDER_STATUS") + @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "0") public Integer orderStatus; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String reMark; From 44676161adea0c99713cb641b7c0aed69e7cbe84 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 7 Mar 2019 09:48:26 +0800 Subject: [PATCH 16/46] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=BC=98=E5=8C=96=20echarts=20=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockReportEnumUtil.java | 30 +++++++++++++++++++++- .../estsh/i3plus/pojo/report/bean/BrPojoAttr.java | 14 ++++++---- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index 833fbeb..cddf4cd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -365,7 +365,11 @@ public class BlockReportEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TEMPLATE_TYPE { - TABLE(1, "表格", "表格模板"); + TABLE(1, "表格", "表格模板"), + ECHARTS_PIE(10, "饼图", "实芯饼图"), + ECHARTS_BAR(20, "柱状图", "柱状图-向上具状图"), + ECHARTS_LINE(30, "折线图", "向右折线条图"), + ECHARTS_TREEMAP(40, "矩形图", "矩形图"); private int value; private String name; @@ -419,6 +423,30 @@ public class BlockReportEnumUtil { } return tmp; } + + public static String[] getChartAttrs(TEMPLATE_TYPE type){ + if(type != null){ + +// TABLE(1, "表格", "表格模板"), +// ECHARTS_PIE(10, "饼图", "实芯饼图"), +// ECHARTS_BAR(20, "柱状图", "柱状图-向上具状图"), +// ECHARTS_LINE(30, "折线图", "向右折线条图"), +// ECHARTS_TREEMAP(40, "矩形图", "矩形图"); + if(type.equals(TEMPLATE_TYPE.TABLE)){ // Table 是可以编辑的 所以不需要指定列 + return null; + }else if(type.equals(TEMPLATE_TYPE.ECHARTS_PIE)){ // 饼图 只需要名称 和值 + return new String[]{"name","value"}; + }else if(type.equals(TEMPLATE_TYPE.ECHARTS_BAR)){ // 饼图 只需要名称 和值 + return new String[]{"name","value"}; + }else if(type.equals(TEMPLATE_TYPE.ECHARTS_LINE)){ // 饼图 只需要名称 和值 + return new String[]{"name","value","xAxis"}; + }else if(type.equals(TEMPLATE_TYPE.ECHARTS_TREEMAP)){ // 饼图 只需要名称 和值 + return new String[]{"name","value"}; + } + } + return null; + } + } /** diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java index b804f90..f23b1c1 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java @@ -64,6 +64,11 @@ public class BrPojoAttr extends BaseBean { @ApiParam(value ="属性别名") private String attrNameAlias; + @Column(name="PARENT_ID") + @ApiParam(value ="上级ID",example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; + @Column(name="ATTR_TYPE") @ApiParam(value ="属性类型",example = "-1") private Integer attrType; @@ -76,15 +81,14 @@ public class BrPojoAttr extends BaseBean { @ApiParam(value ="数据类型",example = "-1") private Integer dataType; + @Column(name="CHART_ATTR_NAME") + @ApiParam(value ="图标属性名称") + private String chartAttrName; + @Column(name="AGGREGATION_TYPE") @ApiParam(value ="聚合类型",example = "-1") private Integer aggregationType; - @Column(name="AGGREGATION_ID") - @ApiParam(value ="聚合类型",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long aggregationId; - @Column(name="ATTR_SORT") @ApiParam(value ="字段排序") private Integer attrSort; From 2133221748b664fcb0b2c9c8cc35eb7a61314f89 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 7 Mar 2019 10:05:21 +0800 Subject: [PATCH 17/46] =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E4=BE=9D=E8=B5=96=20?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-wms/pom.xml | 8 ++++---- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 7ee32b2..bc41914 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -18,10 +18,10 @@ i3plus.pojo i3plus-pojo-base - - i3plus.platform - i3plus-platform-common - + + + + 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 b95a679..5be8731 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 @@ -1,14 +1,11 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; -import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.DateUtils; import java.util.Date; import java.util.List; From d6154a3c14936cfd3d962221c49e77a4011617b6 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 7 Mar 2019 10:50:07 +0800 Subject: [PATCH 18/46] =?UTF-8?q?Transient=E5=8C=85=E5=BC=95=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 1 - .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 6 +++--- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 8c4d440..2e4c55f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -7,11 +7,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** 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 b5934c9..e125060 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 @@ -7,7 +7,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index e568fc1..ab1f30c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -7,11 +7,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index c6759da..ea6d716 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -7,11 +7,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -44,8 +44,8 @@ public class WmsDocMovementMaster extends BaseBean { * MI=移库入库,MO=移库出库,SO=发运 */ @Column(name = "BUSI_TYPE") - @ApiParam(value = "业务类型", example = "1") - public Integer busiType; + @ApiParam("业务类型") + public String busiType; /** * 状态:0=新建,10=处理中 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index e123665..b472d44 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -9,11 +9,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; import java.util.Map; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java index c09c576..f29d8e1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java @@ -42,11 +42,11 @@ public class WmsTaskSrc extends BaseBean { @Column(name = "PRIORITY") @ApiParam("优先级") - public String priority; + public Integer priority; @Column(name = "IS_SN") @ApiParam("是否有条码") - public String isSn; + public Integer isSn; @Column(name = "TRANS_CODE") @ApiParam("默认交易类型") From 0361d6bd79b3394f26db17588406963e31bb1343 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 7 Mar 2019 13:02:15 +0800 Subject: [PATCH 19/46] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=AD=98=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=9B=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=AD=98=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 35 +++++++++++++++------- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 11 ++----- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 +-- .../estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 4 +-- .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java | 2 +- .../i3plus/pojo/wms/bean/WmsTempOrderLock.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 4 +-- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 9 files changed, 37 insertions(+), 29 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 4466eca..5c4d7c6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -793,20 +793,21 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE { - ASN(10, "ASN"), - PO(20, "PO"), - SO(30, "SO"), - MOVE(40, "MOVE"), - IN_STOCK(50, "IN_STOCK"), - SHIPPING(60, "SHIPPING"), - QC(70, "QC"), - CS(80, "CS"); - + ASN(10, "ASN", "ASN"), + PO(20, "PO", "PO"), + SO(30, "SO", "SO"), + MOVE(40, "MOVE", "MOVE"), + IN_STOCK(50, "IN_STOCK", "IN_STOCK"), + SHIPPING(60, "SHIPPING", "SHIPPING"), + QC(70, "QC", "QC"), + CS(80, "CS", "CS"); private int value; + private String code; private String description; - OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE(int value, String description) { + OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -818,6 +819,10 @@ public class WmsEnumUtil { return description; } + public String getCode() { + return code; + } + public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -827,6 +832,16 @@ public class WmsEnumUtil { } 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; + } } /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index ea6d716..9973ec6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -45,7 +45,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "BUSI_TYPE") @ApiParam("业务类型") - public String busiType; + public Integer busiType; /** * 状态:0=新建,10=处理中 @@ -72,7 +72,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "REF_TYPE") @ApiParam(value = "关联单据类型") - private Integer refType; + private String refType; @Column(name = "REF_NO") @ApiParam(value = "关联单据") @@ -82,13 +82,6 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "ERP单号") private String erpSrcNo; - /** - * 单据类型::1=工单配料 - */ - @Column(name = "ORDER_TYPE") - @ApiParam(value = "单据类型") - private Integer orderType; - @Column(name = "PART_NO") @ApiParam(value = "物料编码") private String partNo; 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 7e3ca01..9d6017f 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 @@ -101,7 +101,7 @@ public class WmsMoveDetails extends BaseBean { */ @Column(name="REF_TYPE") @ApiParam("关联单据类型") - public Integer refType; + public String refType; @Column(name="REF_SRC") @ApiParam("关联单号") 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 efb19cd..34304db 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 @@ -125,8 +125,8 @@ public class WmsStockSn extends BaseBean { * 1=ASN,10=PO,20=SO */ @Column(name = "REF_TYPE") - @ApiParam(value = "关联单据类型", example = "0") - private Integer refType; + @ApiParam(value = "关联单据类型") + private String refType; @Column(name = "REF_SRC") @ApiParam(value = "关联单号") 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 e65c004..d71b02d 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 @@ -103,8 +103,8 @@ public class WmsTaskDetails extends BaseBean { private String destWhNo; @Column(name = "REF_TYPE") - @ApiParam(value = "关联单据类型", example = "1") - private Integer refType; + @ApiParam(value = "关联单据类型") + private String refType; @Column(name = "REF_SRC") @ApiParam(value = "关联单据编号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java index f29d8e1..523b240 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java @@ -38,7 +38,7 @@ public class WmsTaskSrc extends BaseBean { @Column(name = "BUSI_TYPE") @ApiParam("业务类型") - public String busiType; + public Integer busiType; @Column(name = "PRIORITY") @ApiParam("优先级") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java index 6aff20c..4e75005 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java @@ -35,7 +35,7 @@ public class WmsTempOrderLock extends BaseBean { */ @Column(name="BIZ_TYPE") @ApiParam("业务类型") - public String bizType; + public Integer bizType; @Column(name="ORDER_NO") @ApiParam("单号") 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 9d85d12..f931e6e 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 @@ -75,8 +75,8 @@ public class WmsTransQuan extends BaseBean { * ASN,PO,SO */ @Column(name = "REF_TYPE") - @ApiParam(value = "关联单据类型", example = "1") - public Integer refType; + @ApiParam(value = "关联单据类型") + public String refType; @Column(name = "REF_SRC") @ApiParam(value = "关联单号") 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 5be8731..9be52e1 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 @@ -756,7 +756,7 @@ public class WmsHqlPack { // 订单号 HqlPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result); // 业务类型 - HqlPack.getStringEqualPack(wmsTempOrderLock.getBizType(), "bizType", result); + HqlPack.getNumEqualPack(wmsTempOrderLock.getBizType(), "bizType", result); // 物料代码 HqlPack.getStringEqualPack(wmsTempOrderLock.getPartNo(), "partNo", result); From 20f8730f416e169e3fdfc750d4ad8905211172c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Thu, 7 Mar 2019 13:10:56 +0800 Subject: [PATCH 20/46] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=9D=A1=E7=A0=81DAO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 2 +- .../pojo/wms/repository/WmsDocMovementSnRepository.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementSnRepository.java 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 8f56b49..d359972 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 @@ -26,7 +26,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="WMS_DOC_MOVEMENT_SN") -@Api("PO条码信息") +@Api("移库条码信息") public class WmsDocMovementSn extends BaseBean { @Column(name="ORDER_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementSnRepository.java new file mode 100644 index 0000000..abc2f20 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementSnRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementSn; + +/** + * @Description : 移库单条码 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-03-07 11:44 + * @Modify: + **/ +public interface WmsDocMovementSnRepository extends BaseRepository { +} From 770b2940298f5d47157ebdddf5d6b4e322bbdd7b Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 7 Mar 2019 14:10:38 +0800 Subject: [PATCH 21/46] =?UTF-8?q?wms=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/repository/WmsConfigRepository.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java new file mode 100644 index 0000000..dfe7f4c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsConfig; + +/** + * @Description : 系统配置 + * @Reference : + * @Author : amy + * @CreateDate : 2019-03-07 10:00 + * @Modify: + **/ +public interface WmsConfigRepository extends BaseRepository { +} From 8a9d09dbdf9f218ecf92187c39e8e67e0c8956a5 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 7 Mar 2019 14:11:02 +0800 Subject: [PATCH 22/46] =?UTF-8?q?wms=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java new file mode 100644 index 0000000..dc3dbd3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : wms系统参数配置 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-07 09:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_CONFIG") +@Api(value="系统配置",description = "WMS系统配置") +public class WmsConfig extends BaseBean { + + @Column(name="NAME") + @ApiParam(value ="名称") + private String name; + + @Column(name="CONFIG_TYPE") + @ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1") + private Integer configType; + + @Column(name="CONFIG_CODE") + @ApiParam(value ="参数代码") + private String configCode; + + // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP + @Column(name="CONFIG_GROUP") + @ApiParam(value ="参数组") + private Integer configGroup; + + // 枚举 ImppEnumUtil.SYS_VALUE_TYPE + @Column(name="CONFIG_VALUE_TYPE") + @ApiParam(value ="参数值类型") + private String configValueType; + + @Column(name="CONFIG_VALUE") + @ApiParam(value ="参数值") + private String configValue; + + @Column(name="CONFIG_DESCRIPTION") + @ApiParam(value ="参数描述") + private String configDescription; + +} From 8a38eca2f0fd136a26ebd8a82d576c81a769d8a1 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 7 Mar 2019 14:15:05 +0800 Subject: [PATCH 23/46] =?UTF-8?q?=E8=8E=B7=E5=8F=96WmsConfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java | 3 +++ 2 files changed, 7 insertions(+) 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 d703238..ca40ead 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 @@ -83,4 +83,8 @@ public class WmsQCMaster extends BaseBean { @Transient @ApiParam(value = "供应商简称") private String VendorDesc; + + @Column(name = "IS_TASK") + @ApiParam(value = "是否生产任务", example = "1") + public Integer isTask; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java index 523b240..36ac8e9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java @@ -51,4 +51,7 @@ public class WmsTaskSrc extends BaseBean { @Column(name = "TRANS_CODE") @ApiParam("默认交易类型") public String transCode; + @Column(name = "IS_ONE_STEP") + @ApiParam("是否一步法") + public Integer isOneStep; } From 288ecaedba34b2bb3a3cd761ac72e514f38b481b Mon Sep 17 00:00:00 2001 From: "Rock.Yu" Date: Thu, 7 Mar 2019 17:25:18 +0800 Subject: [PATCH 24/46] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E4=B8=8B=E4=B8=80=E6=AD=A5=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=20POJO=20=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/rules/WmsSNNextStatusRule.java | 82 ++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java new file mode 100644 index 0000000..56215db --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.pojo.wms.rules; + +/** + * @Description : 纯POJO，WMS 获取条码下一步的状态 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2019-03-07 16:40 + * @Modify: + **/ +public class WmsSNNextStatusRule { + + // 交易类型代码 + private int transTypeCode; + // 业务类型代码 + private int busiTypeCode; + // 一步法操作 + private boolean isOneStep; + // 免检 + private boolean isSkipQC; + // 自动入库 + private boolean isDefaultInStock; + // 原条码状态 + private int srcSNStatusCode; + // 目的条码状态 + private int destSNStatusCode; + + public int getTransTypeCode() { + return transTypeCode; + } + + public void setTransTypeCode(int transTypeCode) { + this.transTypeCode = transTypeCode; + } + + public int getBusiTypeCode() { + return busiTypeCode; + } + + public void setBusiTypeCode(int busiTypeCode) { + this.busiTypeCode = busiTypeCode; + } + + public boolean isOneStep() { + return isOneStep; + } + + public void setOneStep(boolean oneStep) { + isOneStep = oneStep; + } + + public boolean isSkipQC() { + return isSkipQC; + } + + public void setSkipQC(boolean skipQC) { + isSkipQC = skipQC; + } + + public boolean isDefaultInStock() { + return isDefaultInStock; + } + + public void setDefaultInStock(boolean defaultInStock) { + isDefaultInStock = defaultInStock; + } + + public int getDestSNStatusCode() { + return destSNStatusCode; + } + + public void setDestSNStatusCode(int destSNStatusCode) { + this.destSNStatusCode = destSNStatusCode; + } + + public int getSrcSNStatusCode() { + return srcSNStatusCode; + } + + public void setSrcSNStatusCode(int srcSNStatusCode) { + this.srcSNStatusCode = srcSNStatusCode; + } +} From 7ba8fa832c7bb159e8dc8a36c3519de4a83dcca8 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 7 Mar 2019 18:24:48 +0800 Subject: [PATCH 25/46] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E4=BF=A1=E6=81=AF=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 16 ++++++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 8 ++++++-- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java | 6 +++++- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 5 files changed, 34 insertions(+), 6 deletions(-) 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 9d6017f..2036d64 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 @@ -53,7 +53,7 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("客户编号") public String custNo; - @Column(name="QTY") + @Transient @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -61,6 +61,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "处理数量", example = "0") public Double transQty; + @Column(name="REJECT_QTY") + @ApiParam(value = "不合格处理数量", example = "0") + public Double rejectQty; + @Column(name="UNIT") @ApiParam("单位") public String unit; 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 f1016d5..b4d7163 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 @@ -100,6 +100,22 @@ public class WmsMoveSn extends BaseBean { @ApiParam(value = "数量", example = "0") public Double qty; + @Column(name="SRC_QC_STATUS") + @ApiParam(value = "源质量状态", example = "1") + public Integer srcQcStatus; + + @Column(name="SRC_SN_STATUS") + @ApiParam(value = "源条码状态", example = "1") + public Integer srcSnStatus; + + @Column(name="DEST_QC_STATUS") + @ApiParam(value = "目的质量状态", example = "1") + public Integer descQcStatus; + + @Column(name="DEST_SN_STATUS") + @ApiParam(value = "目的条码状态", example = "1") + public Integer destSnStatus; + 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/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index f931e6e..fa7b83f 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 @@ -67,9 +67,13 @@ public class WmsTransQuan extends BaseBean { @ApiParam(value = "交易数量", example = "0") public Double qty; + @Column(name = "REJECT_QTY") + @ApiParam(value = "不合格交易数量", example = "0") + public Double rejectQty; + @Column(name = "TRANS_NO") - @ApiParam(value = "事务编号", example = "1") - public Long transNo; + @ApiParam(value = "事务编号") + public String transNo; /** * ASN,PO,SO 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 dc0af8b..4a69c08 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 @@ -68,9 +68,13 @@ public class WmsTransSn extends BaseBean { @ApiParam(value = "交易数量", example = "0") public Double qty; + @Column(name="REJECT_QTY") + @ApiParam(value = "不合格交易数量", example = "0") + public Double rejectQty; + @Column(name="TRANS_NO") @ApiParam("事务编号") - public Long transNo; + public String transNo; @Column(name = "QC_STATUS") @ApiParam(value = "质检状态", example = "0") 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 9be52e1..e2e2f47 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 @@ -809,11 +809,11 @@ public class WmsHqlPack { * @param tranNo * @return */ - public static String packWmsTransSn(Long tranNo) { + public static String packWmsTransSn(String tranNo) { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getNumEqualPack(tranNo, "transNo", result); + HqlPack.getStringEqualPack(tranNo, "transNo", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); From 9a9c7ba7ec1576f6944d487e9717f31445df8470 Mon Sep 17 00:00:00 2001 From: "Rock.Yu" Date: Thu, 7 Mar 2019 20:09:46 +0800 Subject: [PATCH 26/46] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E4=B8=8B=E4=B8=80=E6=AD=A5=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/rules/WmsSNNextStatusRule.java | 46 +++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java index 56215db..cec3ca8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java @@ -14,11 +14,11 @@ public class WmsSNNextStatusRule { // 业务类型代码 private int busiTypeCode; // 一步法操作 - private boolean isOneStep; + private boolean oneStep; // 免检 - private boolean isSkipQC; + private boolean skipQC; // 自动入库 - private boolean isDefaultInStock; + private boolean defaultInStock; // 原条码状态 private int srcSNStatusCode; // 目的条码状态 @@ -40,43 +40,43 @@ public class WmsSNNextStatusRule { this.busiTypeCode = busiTypeCode; } - public boolean isOneStep() { - return isOneStep; + public int getDestSNStatusCode() { + return destSNStatusCode; } - public void setOneStep(boolean oneStep) { - isOneStep = oneStep; + public void setDestSNStatusCode(int destSNStatusCode) { + this.destSNStatusCode = destSNStatusCode; } - public boolean isSkipQC() { - return isSkipQC; + public int getSrcSNStatusCode() { + return srcSNStatusCode; } - public void setSkipQC(boolean skipQC) { - isSkipQC = skipQC; + public void setSrcSNStatusCode(int srcSNStatusCode) { + this.srcSNStatusCode = srcSNStatusCode; } - public boolean isDefaultInStock() { - return isDefaultInStock; + public boolean isOneStep() { + return oneStep; } - public void setDefaultInStock(boolean defaultInStock) { - isDefaultInStock = defaultInStock; + public void setOneStep(boolean oneStep) { + this.oneStep = oneStep; } - public int getDestSNStatusCode() { - return destSNStatusCode; + public boolean isSkipQC() { + return skipQC; } - public void setDestSNStatusCode(int destSNStatusCode) { - this.destSNStatusCode = destSNStatusCode; + public void setSkipQC(boolean skipQC) { + this.skipQC = skipQC; } - public int getSrcSNStatusCode() { - return srcSNStatusCode; + public boolean isDefaultInStock() { + return defaultInStock; } - public void setSrcSNStatusCode(int srcSNStatusCode) { - this.srcSNStatusCode = srcSNStatusCode; + public void setDefaultInStock(boolean defaultInStock) { + this.defaultInStock = defaultInStock; } } From 44148da43c5c94d10a49bb13e12933ac1c17e537 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 7 Mar 2019 21:09:56 +0800 Subject: [PATCH 27/46] comit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 10 ++++ .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 55 +++++++--------------- .../i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 38 ++++----------- .../pojo/wms/bean/WmsDocMovementDetails.java | 26 +--------- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 2 +- .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 53 ++++++--------------- .../estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 25 +--------- .../pojo/wms/modelbean/WmsOrderDetailsModel.java | 47 ++++++++++++++++++ .../pojo/wms/modelbean/WmsOrderMasterModel.java | 23 +++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 10 files changed, 127 insertions(+), 154 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderMasterModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 5c4d7c6..b33c25d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -842,6 +842,16 @@ public class WmsEnumUtil { } return tmp; } + + public static OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + return values()[i]; + } + } + return null; + } } /** 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 e125060..6d8434c 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -25,89 +26,65 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_ASN_DETAILS") +@Table(name = "WMS_DOC_ASN_DETAILS") @Api("ASN订单明细信息") -public class WmsASNMasterDetails extends BaseBean { +public class WmsASNMasterDetails extends WmsOrderDetailsModel { - @Column(name="ORDER_NO") - @ApiParam("订单号") - public String orderNo; - - @Column(name="ITEM") - @ApiParam("行号") - public String item; - - @Column(name="PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name="PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name="QTY") - @ApiParam(value = "需求数量", example = "0") - public Double qty; - - @Column(name="PO_ITEM") + @Column(name = "PO_ITEM") @ApiParam("PO行号") public String poItem; - @Column(name="UNIT") - @ApiParam("单位") - public String unit; - - @Column(name="ZDATE") + @Column(name = "ZDATE") @ApiParam("计划交货日期") public String zDate; - @Column(name="ZTIME") + @Column(name = "ZTIME") @ApiParam("计划交货时间") public String zTime; /** * 状态:N=正常,C=行取消,R=已收货 */ - @Column(name="ITEM_STATUS") + @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") public Integer itemStatus; - @Column(name="PACKAGE") + @Column(name = "PACKAGE") @ApiParam("包装名称") public String packAge; /** * 是否免费:0=计费,1=免费 */ - @Column(name="IS_FREE") + @Column(name = "IS_FREE") @ApiParam(value = "是否免费", example = "1") public Integer isFree; - @Column(name="DOCK") + @Column(name = "DOCK") @ApiParam("道口") public String dock; - @Column(name="SN_1D") + @Column(name = "SN_1D") @ApiParam("一维条码") public String snOneBarCode; - @Column(name="SN_2D") + @Column(name = "SN_2D") @ApiParam("二维条码") public String snTwoBarCode; - @Column(name="GROUP_NO") + @Column(name = "GROUP_NO") @ApiParam("组条码") public String groupNo; - @Column(name="ERP_WH_NO") + @Column(name = "ERP_WH_NO") @ApiParam("默认收货库存地") public String erpWhNo; - @Column(name="VENDOR_LOT_NO") + @Column(name = "VENDOR_LOT_NO") @ApiParam("供应商批次") public String vendorLotNo; - @Column(name="REC_QTY") + @Column(name = "REC_QTY") @ApiParam(value = "已收数量", example = "0") public Double recQty; 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 e5ab093..e28e2c0 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -24,51 +25,32 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_CS_DETAILS") +@Table(name = "WMS_DOC_CS_DETAILS") @Api("盘点单冻结信息") -public class WmsCSOrderDetails extends BaseBean { +public class WmsCSOrderDetails extends WmsOrderDetailsModel { - @Column(name="ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @Column(name="WH_NO") + @Column(name = "WH_NO") @ApiParam("仓库代码") public String whNo; - @Column(name="ZONE_NO") + @Column(name = "ZONE_NO") @ApiParam("存储区编号") public String zoneNo; - @Column(name="LOCATE_NO") + @Column(name = "LOCATE_NO") @ApiParam("库位编号") public String locateNo; - @Column(name="PART_NO") - @ApiParam("物料代码") - public String partNo; - - @Column(name="PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name="SN") + @Column(name = "SN") @ApiParam("条码") public String sn; - @Column(name="QTY") - @ApiParam(value = "需求数量", example = "0") - public Double qty; - - @Column(name="UNIT") - @ApiParam("单位") - public String unit; /** * 质检状态:1=未质检,10=质检中,20=质检合格, * 30=质检不合格,40=已退货 */ - @Column(name="QC_STATUS") + @Column(name = "QC_STATUS") @ApiParam(value = "质检状态", example = "1") public Integer qcStatus; @@ -77,7 +59,7 @@ public class WmsCSOrderDetails extends BaseBean { * 30=已入库,40=待出库,50=已出库, * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 */ - @Column(name="SN_STATUS") + @Column(name = "SN_STATUS") @ApiParam(value = "条码状态", example = "1") public Integer snStatus; @@ -85,7 +67,7 @@ public class WmsCSOrderDetails extends BaseBean { * 处理状态:1=已创建,5=已盘,10=已冻结 * ,20=已解冻,30=取消冻结 */ - @Column(name="TRANS_STATUS") + @Column(name = "TRANS_STATUS") @ApiParam(value = "处理状态", example = "1") public Integer transStatus; } 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 f870b57..84eb6f5 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -26,26 +27,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_DOC_MOVEMENT_DETAILS") @Api("移库单明细表") -public class WmsDocMovementDetails extends BaseBean { - @Column(name = "ORDER_NO") - @ApiParam(value = "单号") - private String orderNo; - - @Column(name = "ITEM") - @ApiParam(value = "行号", example = "1") - private Integer item; - - @Column(name = "PART_NO") - @ApiParam(value = "物料编码") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam(value = "物料名称") - private String partName; - - @Column(name = "UNIT") - @ApiParam(value = "单位") - private String unit; +public class WmsDocMovementDetails extends WmsOrderDetailsModel { @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") @@ -71,10 +53,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("目标库位代码") public String destLocateNo; - @Column(name = "QTY") - @ApiParam(value = "需求数量", example = "1") - private Double qty; - @Column(name = "PRINT_QTY") @ApiParam(value = "条码打印数量", example = "1") private Double printQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 9973ec6..2755a0e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -88,7 +88,7 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "PART_NAME") @ApiParam(value = "物料名称") - private String partName; + private String partNameRdd; @Column(name = "QTY") @ApiParam(value = "数量", example = "1") 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 97216a8..fda45d5 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -24,77 +25,53 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_PO_DETAILS") +@Table(name = "WMS_DOC_PO_DETAILS") @Api("PO订单明细信息") -public class WmsPOMasterDetails extends BaseBean { +public class WmsPOMasterDetails extends WmsOrderDetailsModel { - @Column(name="ORDER_NO") - @ApiParam("订单号") - public String orderNo; - - @Column(name="ITEM") - @ApiParam("行号") - public String item; - - @Column(name="PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name="PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name="QTY") - @ApiParam(value = "需求数量", example = "0") - public Double qty; - - @Column(name="PRINT_QTY") + @Column(name = "PRINT_QTY") @ApiParam(value = "条码打印数量", example = "0") public Double printQty; - @Column(name="RC_QTY") + @Column(name = "RC_QTY") @ApiParam(value = "收货数量", example = "0") public Double rcQty; - @Column(name="PASS_QTY") + @Column(name = "PASS_QTY") @ApiParam(value = "质检合格数量", example = "0") public Double passQty; - @Column(name="NG_QTY") + @Column(name = "NG_QTY") @ApiParam(value = "质检不合格数量", example = "0") public Double ngQty; - @Column(name="UNIT") - @ApiParam("单位") - public String unit; - - @Column(name="ZDATE") + @Column(name = "ZDATE") @ApiParam("计划交货日期") public String zDate; - @Column(name="ZTIME") + @Column(name = "ZTIME") @ApiParam("计划交货时间") public String zTime; - @Column(name="WH_NO") - @ApiParam("默认入库仓库代码") - public String whNo; + @Column(name = "ERP_WH_NO") + @ApiParam("默认收货库存地") + public String erpWhNo; /** * 状态:10 N=正常,20 C=行取消 */ - @Column(name="ITEM_STATUS") + @Column(name = "ITEM_STATUS") @ApiParam("状态") public String itemStatus; - @Column(name="SNP") + @Column(name = "SNP") @ApiParam("标准包装") public String snp; /** * 是否免费:0=计费,1=免费 */ - @Column(name="IS_FREE") + @Column(name = "IS_FREE") @ApiParam(value = "是否免费", example = "1") public Integer isFree; } 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 98b6ca0..2d12d58 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -27,15 +28,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="WMS_QC_DETAILS") @Api("质检单明细信息") -public class WmsQCDetails extends BaseBean { - - @Column(name="ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @Column(name="ITEM") - @ApiParam("行号") - public String item; +public class WmsQCDetails extends WmsOrderDetailsModel { /** * 状态:N=正常,C=行取消 @@ -48,9 +41,6 @@ public class WmsQCDetails extends BaseBean { @ApiParam("备注") public String reMark; - @Column(name="PLAN_QTY") - @ApiParam(value = "应检数量", example = "0") - public Double planQty; @Column(name="FACT_QTY") @ApiParam(value = "实检数量", example = "0") @@ -73,15 +63,4 @@ public class WmsQCDetails extends BaseBean { @ApiParam(value="检验时间",example = "2000-01-01 01:00:00") public String qcTime; - @Column(name="PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name="PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name="UNIT") - @ApiParam("单位") - public String unit; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java new file mode 100644 index 0000000..6b4b34a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description : 单据明细Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-03-07 19:18 + * @Modify: + **/ +@Data +@Api("单据明细Model") +public class WmsOrderDetailsModel extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + @Column(name = "ITEM") + @ApiParam("行号") + public String item; + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderMasterModel.java new file mode 100644 index 0000000..6107123 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderMasterModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; + +/** + * @Description : 单据Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-03-07 19:18 + * @Modify: + **/ +@Data +@Api("单据Model") +public class WmsOrderMasterModel extends BaseBean { + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; +} 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 9be52e1..2eae75c 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 @@ -183,7 +183,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); + HqlPack.getStringLikerPack(wmsPart.getPartName(), "partNameRdd", result); HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); From 4b4fb3024835a90ed5ac784c441606be79936db2 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 8 Mar 2019 10:27:38 +0800 Subject: [PATCH 28/46] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=20=E9=A5=BC=E5=9B=BE=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index cddf4cd..a003e66 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -455,9 +455,9 @@ public class BlockReportEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TEMPLATE_STYLE { - TABLE_LEFT(1, TEMPLATE_TYPE.TABLE, "text-left", "表单左对齐"), - TABLE_RIGHT(2, TEMPLATE_TYPE.TABLE, "text-center", "表单右对齐"), - TABLE_CENTER(3, TEMPLATE_TYPE.TABLE, "text-right", "表单居中"); + TABLE_LEFT(1, TEMPLATE_TYPE.TABLE, "text-align: left!important;", "表单左对齐"), + TABLE_RIGHT(2, TEMPLATE_TYPE.TABLE, "text-align: right!important;", "表单右对齐"), + TABLE_CENTER(3, TEMPLATE_TYPE.TABLE, "text-align: center!important;", "表单居中"); private int value; private TEMPLATE_TYPE group; 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 ff56863..6ffb2b2 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.report.sqlpack; +import cn.estsh.i3plus.pojo.base.enumutil.BlockReportEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.report.bean.*; @@ -76,7 +77,12 @@ public class ReportHqlPack { // 查询参数封装 HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result); - HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",result); + if(template.getTemplateStatus() != null && + template.getTemplateStatus().intValue() == BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_FULFIL.getValue()){ + HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",result); + }else { + HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_FULFIL.getValue(),"templateStatus",result); + } HqlPack.getStringLikerPack(template.getName(),"name",result); // 添加默认排序 From 5b6b720d7d85b32192907321d4e4afee94cbdfff Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 8 Mar 2019 10:31:47 +0800 Subject: [PATCH 29/46] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E8=A1=A8=20?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=87=8D=E7=BD=AE=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 2 -- 1 file changed, 2 deletions(-) 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 4d003e2..31dda7a 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 @@ -1048,8 +1048,6 @@ public class ImppEnumUtil { } } - //messageReceiverType - @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_RECEIVER_TYPE { INTERNAL(1, "内部人员接收"), From 3056922b15f0cb149fcb079ffe67cfd1a2d3d75d Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 8 Mar 2019 11:29:39 +0800 Subject: [PATCH 30/46] =?UTF-8?q?POMasterDetails=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=90=8DwhNo->erpWhNo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 12 ++++++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java | 2 +- .../i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 +++--- 4 files changed, 17 insertions(+), 5 deletions(-) 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 6d8434c..a694def 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 @@ -88,4 +88,16 @@ public class WmsASNMasterDetails extends WmsOrderDetailsModel { @ApiParam(value = "已收数量", example = "0") public Double recQty; + @Override + public String toString() { + return "WmsASNMasterDetails{" + + "recQty=" + recQty + + ", partNo='" + partNo + '\'' + + ", partNameRdd='" + partNameRdd + '\'' + + ", item=" + item + + ", qty=" + qty + + ", unit='" + unit + '\'' + + ", orderNo='" + orderNo + '\'' + + '}'; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java index c5e5990..0246ac2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java @@ -34,7 +34,7 @@ public class WmsQCTrans extends BaseBean { @Column(name="ITEM") @ApiParam("行号") - public String item; + public Integer item; /** * 状态:1=创建,10=已处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java index 6b4b34a..0be658a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java @@ -34,7 +34,7 @@ public class WmsOrderDetailsModel extends BaseBean { public String partNameRdd; @Column(name = "ITEM") @ApiParam("行号") - public String item; + public Integer item; @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/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 784d620..8a923bd 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 @@ -50,7 +50,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getItem(), "item", result); + HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result); @@ -574,7 +574,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getItem(), "item", result); + HqlPack.getNumEqualPack(wmsASNMasterDetails.getItem(), "item", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result); HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result); @@ -991,7 +991,7 @@ public class WmsHqlPack { //单号 HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result); //行号 - HqlPack.getStringEqualPack(wmsQCTrans.getItem(), "item", result); + HqlPack.getNumEqualPack(wmsQCTrans.getItem(), "item", result); getStringBuilderPack(wmsQCTrans, result); From 6c6710dd675c1bc1248d5ccd0a2c9275f109dd4c Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Fri, 8 Mar 2019 13:27:11 +0800 Subject: [PATCH 31/46] =?UTF-8?q?=E5=9C=A8=E9=80=94=E5=BA=93=E4=BD=8D=20?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 5c4d7c6..0fc4a96 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -454,7 +454,8 @@ public class WmsEnumUtil { COMBINATION_LOCATE(40, "D", "组合库"), LINE_LOCATE(50, "L", "线边库"), NC_LOCATE(60, "N", "NC库"), - SPILLAGE_LOCATE(70, "Y", "溢料库"); + SPILLAGE_LOCATE(70, "Y", "溢料库"), + TRANSIT_LOCATE(80, "T", "在途库"); private int value; private String code; 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 6e17fab..67cc0ee 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 @@ -37,7 +37,7 @@ public class WmsLocate extends BaseBean { private String locateName; /** - * 1=收货库,10=基础库,20=机动库,30=组合库,40=线边库,50=NC库 + * 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位 */ @Column(name="LOCATE_TYPE") @ApiParam(value ="库位类型") From a5390d7b1a6e72d375b1dad31bb5a81e43cd3dc8 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 8 Mar 2019 13:33:44 +0800 Subject: [PATCH 32/46] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 +++++++++++++ 1 file changed, 13 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 e2e2f47..b70830d 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 @@ -1306,6 +1306,19 @@ public class WmsHqlPack { } /** + * 根据条件模糊查询库存条码信息 + * @param wmsStockSn + * @return + */ + public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsStockSn.getSn(),"sn", result); + HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); + getStringBuilderPack(wmsStockSn, result); + return result.toString(); + } + + /** * 根据条件查询库存信息 * @param wmsStockQuan * @return From fc89b8493dca00a6d9d93430218e1a9b1c1e887e Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 8 Mar 2019 14:56:32 +0800 Subject: [PATCH 33/46] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=96=B0=E5=A2=9E=E6=BA=90=EF=BC=8C=E7=9B=AE=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=9C=B0=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 84eb6f5..32d1581 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 @@ -97,4 +97,12 @@ public class WmsDocMovementDetails extends WmsOrderDetailsModel { @Column(name = "REC_QTY") @ApiParam(value = "已收货数量", example = "1") private Double recQty; + + @Column(name = "SRC_AREA_NO") + @ApiParam("源库存地代码") + public String srcAreaNo; + + @Column(name = "DEST_AREA_NO") + @ApiParam("目的库存地代码") + public String destAreaNo; } From ce9cbe119835af6eda0d8841e3fc4862e0b72d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 8 Mar 2019 15:07:19 +0800 Subject: [PATCH 34/46] =?UTF-8?q?=E6=9B=B4=E6=96=B0pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 48 ++++++++++++++++++++++ .../estsh/i3plus/pojo/model/wms/TransSnModle.java | 3 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 +- 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b33c25d..1063a3a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -300,6 +300,54 @@ public class WmsEnumUtil { } /** + * 收货主表信息 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RC_ORDER_STATUS { + CREATE(10, "新建"), + RECEIPT(20, "收货中"), + RECEIPT_FINISH(30, "收货完成"), + CLOSED(40, "已关闭"), + CANCELLED(50, "已取消"); + + private int value; + private String description; + + RC_ORDER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** * PO条码状态信息 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index 6c66647..0d2676c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -23,4 +23,7 @@ public class TransSnModle extends BaseComponetsParam{ @ApiParam(value = "是否分组") public int isGroup; + @ApiParam(value = "物料") + public String partNo; + } 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 34304db..b81702d 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 @@ -51,7 +51,7 @@ public class WmsStockSn extends BaseBean { private String partNameRdd; @Column(name = "LOT_NO") - @ApiParam("批次编码") + @ApiParam("收货日期（批次编码）") public String lotNo; @Column(name = "DATE_CODE") From e3ae01386872835a46f2f1ed037a3bae921803a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 8 Mar 2019 15:36:20 +0800 Subject: [PATCH 35/46] =?UTF-8?q?=E6=9B=B4=E6=96=B0POJO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index 0d2676c..496428d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -26,4 +26,7 @@ public class TransSnModle extends BaseComponetsParam{ @ApiParam(value = "物料") public String partNo; + @ApiParam(value = "分组编号") + public String packageNo; + } 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 b81702d..5012840 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 @@ -98,14 +98,13 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "数量", example = "0") private Double qty; /** - * 1=未质检,10=质检合格,20=质检不合格,30=已退货 + * 质量状态:10=合格,20=不合格,30=隔离 */ @Column(name = "QC_STATUS") @ApiParam(value = "质检状态", example = "0") private Integer qcStatus; /** - * :1=创建,10=已收货,20=已质检,30=已入库,40=待出库,50=已出库, - * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 + * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 */ @Column(name = "SN_STATUS") @ApiParam(value = "条码状态", example = "0") From 1bdc307a1b5ea78f6fb8d5a8c568d8073516785c Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 8 Mar 2019 17:12:40 +0800 Subject: [PATCH 36/46] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=20=E6=8A=98=E7=BA=BF=E5=9B=BE=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index a003e66..cc02e4e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -439,7 +439,7 @@ public class BlockReportEnumUtil { }else if(type.equals(TEMPLATE_TYPE.ECHARTS_BAR)){ // 饼图 只需要名称 和值 return new String[]{"name","value"}; }else if(type.equals(TEMPLATE_TYPE.ECHARTS_LINE)){ // 饼图 只需要名称 和值 - return new String[]{"name","value","xAxis"}; + return new String[]{"xAxis","name","value"}; }else if(type.equals(TEMPLATE_TYPE.ECHARTS_TREEMAP)){ // 饼图 只需要名称 和值 return new String[]{"name","value"}; } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java index f23b1c1..49b0c09 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java @@ -89,6 +89,11 @@ public class BrPojoAttr extends BaseBean { @ApiParam(value ="聚合类型",example = "-1") private Integer aggregationType; + @Column(name="AGGREGATION_ID") + @ApiParam(value ="聚合类型",example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long aggregationId; + @Column(name="ATTR_SORT") @ApiParam(value ="字段排序") private Integer attrSort; From 0ce23f95b189efc5638f99c0ee24af6b49e48834 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Fri, 8 Mar 2019 18:44:18 +0800 Subject: [PATCH 37/46] =?UTF-8?q?=E6=8B=86=E5=88=86=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 2f30f9b..6d3064e 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 @@ -1313,8 +1313,8 @@ public class WmsHqlPack { public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsStockSn.getSn(),"sn", result); - HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); getStringBuilderPack(wmsStockSn, result); + HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); return result.toString(); } From d41a4f0dc932cb93fa182a9dbb43c2a83a684420 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 8 Mar 2019 18:54:22 +0800 Subject: [PATCH 38/46] =?UTF-8?q?=E6=8F=90=E4=BA=A4NC=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 5c4d7c6..2150f1d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -596,14 +596,15 @@ public class WmsEnumUtil { ALLOCATION(40, "ALLOCATION", "调拨"), SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"), SCATTERED_IN(60, "SCATTERED_IN", "零星入库"), - NC_WAREHOSING(70, "NC_WAREHOSING", "NC入库"), + NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"), SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"), CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"), PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"), INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"), SCRAPPING_OUT(120, "SCRAPPING_OUT", "报废出库"), RECEIVING_IN(130, "RECEIVING_IN", "收货入库"), - OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"); + OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"), + NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"); private int value; private String code; From e28dfa55c6ba2b1d4754f22d78c43ecd79bc8e3d Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 8 Mar 2019 19:06:06 +0800 Subject: [PATCH 39/46] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8Bug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 6ffb2b2..bfa9604 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 @@ -78,10 +78,10 @@ public class ReportHqlPack { // 查询参数封装 HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result); if(template.getTemplateStatus() != null && - template.getTemplateStatus().intValue() == BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_FULFIL.getValue()){ + template.getTemplateStatus().intValue() == BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue()){ HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",result); }else { - HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_FULFIL.getValue(),"templateStatus",result); + HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); } HqlPack.getStringLikerPack(template.getName(),"name",result); From b667d6840e5aa3e1446fbccf4fb6e7ce0a7c8c82 Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Fri, 8 Mar 2019 19:16:49 +0800 Subject: [PATCH 40/46] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=92=8C=E6=A0=B9=E6=8D=AE=E6=9D=83=E9=99=90=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/DataAuthEnumUtil.java | 45 +++++++++++++++ .../pojo/wms/repository/WmsDataAuthRepository.java | 19 +++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 66 ++++++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataAuthRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java new file mode 100644 index 0000000..6c4d4c3 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : wms数据权限枚举 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-3-8 15:53 + * @Modify: + **/ +public class DataAuthEnumUtil { + + /** + * 数据对象枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_OBJ_TYPE { + WAREHOUSE("10", "WAREHOUSE", "仓库对象"), + ZONE("20", "ZONE", "存储区对象"), + LOCATE("30", "LOCATE", "库位对象"); + + private String code; + private String description; + String value; + + DATA_OBJ_TYPE(String value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataAuthRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataAuthRepository.java new file mode 100644 index 0000000..7064482 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataAuthRepository.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WareHouse; +import cn.estsh.i3plus.pojo.wms.bean.WmsDataAuth; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @Description : wms数据权限 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-03-08 14:47 + * @Modify: + **/ +@Repository +public interface WmsDataAuthRepository extends BaseRepository { +} 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 8a923bd..046704d 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 @@ -2,13 +2,18 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.DataAuthEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; +import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; /** * @Description : 仓库管理对象封装 @@ -1317,4 +1322,65 @@ public class WmsHqlPack { getStringBuilderPack(wmsStockQuan, result); return result.toString(); } + + /** + * 根据用户角色id列表查询数据权限信息 + * @param roleIds + * @return + */ + public static String packHqlWmsDataAuth(List roleIds) { + StringBuffer result = new StringBuffer(); + String data = String.join(",", roleIds); + // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getInPack(data,"roleCode",result); + getStringBuilderPack(new WmsDataAuth(), result); + return result.toString(); + } + + /** + * 根据权限数据拼查询任务详情sql + * @param groupDataAuth + * @return + */ + public static String packHqlWmsTaskDetail(Map> groupDataAuth) { + StringBuffer result = new StringBuffer(); + Set>> entries = groupDataAuth.entrySet(); + String warehouse = DataAuthEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue(); + String locate = DataAuthEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue(); + String zone = DataAuthEnumUtil.DATA_OBJ_TYPE.ZONE.getValue(); + //拼sql + entries.stream().filter(o->!Strings.isNullOrEmpty(o.getKey())).forEach(o->{ + List value = o.getValue(); + List vList = value.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList()); + String data = String.join(",", vList); + if(warehouse.equals(o.getKey())){ + // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getInPack(data,"destWhNo",result); + } + if(locate.equals(o.getKey())){ + // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getInPack(data,"destLocateNo",result); + } + if(zone.equals(o.getKey())){ + // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getInPack(data,"destZoneNo",result); + } + }); + getStringBuilderPack(new WmsDataAuth(), result); + return result.toString(); + } + + /** + * 给定字段动态in sql + * @param columnName + * @param vals + * @return + */ + public static String packHqlAndIn(BaseBean bean,String columnName,List vals) { + StringBuffer result = new StringBuffer(); + String data = String.join(",", vals); + HqlPack.getInPack(data,columnName,result); + getStringBuilderPack(bean, result); + return result.toString(); + } } From d89770e13890a808a872bcdff6b20fe3fe1100a7 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 8 Mar 2019 20:16:24 +0800 Subject: [PATCH 41/46] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 10 +++++++++- .../estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java | 10 ++++++---- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) 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 d71b02d..34ab3f6 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 @@ -24,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_TASK_DETAILS") +@Table(name = "WMS_TASK_DETAILS") @Api("作业任务明细信息") public class WmsTaskDetails extends BaseBean { @@ -109,4 +109,12 @@ public class WmsTaskDetails extends BaseBean { @Column(name = "REF_SRC") @ApiParam(value = "关联单据编号") private String refSrc; + + @Column(name = "SRC_AREA_NO") + @ApiParam("源库存地代码") + public String srcAreaNo; + + @Column(name = "DEST_AREA_NO") + @ApiParam("目的库存地代码") + public String destAreaNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java index 0be658a..68faeba 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; +import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,10 +10,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -24,6 +22,10 @@ import java.util.List; **/ @Data @Api("单据明细Model") +@Entity +//以子类table为准 +@javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS) +@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换 public class WmsOrderDetailsModel extends BaseBean { @Column(name = "PART_NO") 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 2f30f9b..71a1a1a 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 @@ -83,7 +83,7 @@ public class WmsHqlPack { * @param orderNos * @return */ - public static String packHqlWmsDocMovementDetailsByOrderNos(List orderNos) { + public static String packWmsOrderDetailsByOrderNos(List orderNos) { StringBuffer result = new StringBuffer(); StringBuffer orderNoStr = new StringBuffer(); for (int i = 0; i < orderNos.size(); i++) { From 1fd8e5e76fe0f15f5edfca0fddae6fbb93030b6d Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Sun, 10 Mar 2019 09:33:35 +0800 Subject: [PATCH 42/46] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 12 ++++++++++++ .../i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java | 10 ++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) 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 0004a3f..fa26efe 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 @@ -39,4 +39,16 @@ public class WmsLocatePart extends BaseBean{ @Column(name="PART_NAME_RDD") @ApiParam(value ="物料名称") private String partNameRdd; + + @Column(name = "PULL_QTY") + @ApiParam(value = "拉动数量", example = "0") + private Double pullQty; + + @Column(name = "MAX") + @ApiParam(value = "最大值", example = "0") + private Double max; + + @Column(name = "MIN") + @ApiParam(value = "最小值", example = "0") + private Double min; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java index 0be658a..755af50 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; +import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,10 +10,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -23,6 +21,10 @@ import java.util.List; * @Modify: **/ @Data +@Entity +//以子类table为准 +@javax.persistence.Inheritance(strategy= InheritanceType.TABLE_PER_CLASS) +@JsonInclude(value = JsonInclude.Include.NON_EMPTY) @Api("单据明细Model") public class WmsOrderDetailsModel extends BaseBean { From 7e8965421e721e8e7d2180f6800b846e4b1cd3b6 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Sun, 10 Mar 2019 10:07:09 +0800 Subject: [PATCH 43/46] WmsOrderDetailsModel --- .../java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java index d4da820..755af50 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java @@ -26,10 +26,6 @@ import java.util.List; @javax.persistence.Inheritance(strategy= InheritanceType.TABLE_PER_CLASS) @JsonInclude(value = JsonInclude.Include.NON_EMPTY) @Api("单据明细Model") -@Entity -//以子类table为准 -@javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS) -@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换 public class WmsOrderDetailsModel extends BaseBean { @Column(name = "PART_NO") From f662140075844d166cefd819758c7b3da2ad121c Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Sun, 10 Mar 2019 10:14:28 +0800 Subject: [PATCH 44/46] =?UTF-8?q?WmsOrderMasterModel=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 26 ++++++++++++- .../i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 26 ++++++++++++- .../pojo/wms/bean/WmsDocMovementDetails.java | 26 ++++++++++++- .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 26 ++++++++++++- .../estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 44 ++++++++++++++++------ 5 files changed, 129 insertions(+), 19 deletions(-) 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 a694def..5d5d293 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,7 +27,30 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_DOC_ASN_DETAILS") @Api("ASN订单明细信息") -public class WmsASNMasterDetails extends WmsOrderDetailsModel { +public class WmsASNMasterDetails extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; @Column(name = "PO_ITEM") @ApiParam("PO行号") 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 e28e2c0..c4a8117 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -27,7 +26,30 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_DOC_CS_DETAILS") @Api("盘点单冻结信息") -public class WmsCSOrderDetails extends WmsOrderDetailsModel { +public class WmsCSOrderDetails extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; @Column(name = "WH_NO") @ApiParam("仓库代码") 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 32d1581..a8fd0f0 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -27,7 +26,30 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_DOC_MOVEMENT_DETAILS") @Api("移库单明细表") -public class WmsDocMovementDetails extends WmsOrderDetailsModel { +public class WmsDocMovementDetails extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") 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 fda45d5..6e62522 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -27,7 +26,30 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_DOC_PO_DETAILS") @Api("PO订单明细信息") -public class WmsPOMasterDetails extends WmsOrderDetailsModel { +public class WmsPOMasterDetails extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; @Column(name = "PRINT_QTY") @ApiParam(value = "条码打印数量", example = "0") 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 2d12d58..5639e4c 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -26,41 +25,64 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_QC_DETAILS") +@Table(name = "WMS_QC_DETAILS") @Api("质检单明细信息") -public class WmsQCDetails extends WmsOrderDetailsModel { +public class WmsQCDetails extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; /** * 状态:N=正常,C=行取消 */ - @Column(name="ITEM_STATUS") + @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") public Integer itemStatus; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String reMark; - @Column(name="FACT_QTY") + @Column(name = "FACT_QTY") @ApiParam(value = "实检数量", example = "0") public Double factQty; - @Column(name="PASS_QTY") + @Column(name = "PASS_QTY") @ApiParam(value = "合格数量", example = "0") public Double passQty; - @Column(name="REJECT_QTY") + @Column(name = "REJECT_QTY") @ApiParam(value = "不合格数量", example = "0") public Double rejectQty; - @Column(name="QC_USER") + @Column(name = "QC_USER") @ApiParam("检验员") public String qcUser; - @Column(name="QC_TIME") + @Column(name = "QC_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="检验时间",example = "2000-01-01 01:00:00") + @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00") public String qcTime; } From 398a3d98c5255ac0a7eb1211bcd17e6f39bc697c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Sun, 10 Mar 2019 17:43:49 +0800 Subject: [PATCH 45/46] =?UTF-8?q?=E6=9B=B4=E6=96=B0POJO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java | 9 +++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 10 +++++++--- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 822d2f7..3504d07 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -909,7 +909,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TASK_INFO_STATUS { - CREATE(10, "创建"), FINISH(20, "待处理"), FAIL(30, "已处理"); + CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index 496428d..ac49208 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -29,4 +29,13 @@ public class TransSnModle extends BaseComponetsParam{ @ApiParam(value = "分组编号") public String packageNo; + /** + * 针对抽点 + */ + public double cpQty; + + /** + * 供应商批次 + */ + public String dateCode; } 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 a27823a..627176c 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 @@ -29,6 +29,14 @@ import javax.persistence.Transient; @Api("抽点记录信息") public class WmsCheckFactRecord extends BaseBean { + @Column(name = "REF_TYPE") + @ApiParam(value = "关联单据类型") + private String refType; + + @Column(name = "REF_SRC") + @ApiParam(value = "关联单据编号") + private String refSrc; + @Column(name="PO_NO") @ApiParam("采购单号") public String poNo; 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 d359972..30ae352 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 @@ -49,19 +49,23 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam(value = "数量", example = "0") public Double qty; +// @Column(name="TRANS_QTY") +// @ApiParam(value = "处理数量", example = "0") +// public Double transQty; + @Column(name="UNIT") @ApiParam("单位") public String unit; /** - * 状态:10 = 创建，20 = 已打印，30 = 已收货 + * 状态:同库存条码状态一致 */ @Column(name="SN_STATUS") @ApiParam(value = "状态", example = "10") public Integer snStatus; - @Column(name="SN_1D") + @Column(name="SN") @ApiParam("一维条码") - public String snOneBarCode; + public String sn; } From 31d91f48b35d9b5835f9d0eec93a56522a0a211a Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Sun, 10 Mar 2019 19:21:31 +0800 Subject: [PATCH 46/46] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=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/WmsEnumUtil.java | 104 +++++++++------------ .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 6 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 7 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 16 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 32 +++---- .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 86 ++++++++--------- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 +- 7 files changed, 123 insertions(+), 136 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 822d2f7..8f27202 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -94,6 +94,39 @@ public class WmsEnumUtil { } /** + * 移库单主表：优先级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRIORITY { + NORMAL(1, "正常"), URGENT(2, "紧急"); + private int value; + private String description; + + PRIORITY(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** * 订单明细信息 状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -250,22 +283,20 @@ public class WmsEnumUtil { } /** - * 主表信息 状态 + * 移库单主表状态；质检单主表状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ORDER_STATUS { - CREATE(1, "新建"), - RECEIPT(10, "收货中"), - RECEIPT_FINISH(20, "收货完成"), - WAREHOUSING(30, "入库中"), - WAREHOUSING_FINISH(40, "入库完成"), - CLOSED(50, "已关闭"), - CANCELLED(60, "已取消"); + public enum MASTER_ORDER_STATUS { + CREATE(10, "新建"), + RECEIPT(20, "处理中"), + RECEIPT_FINISH(30, "已完成"), + CLOSED(40, "已关闭"), + CANCELLED(50, "已取消"); private int value; private String description; - ORDER_STATUS(int value, String description) { + MASTER_ORDER_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -698,53 +729,6 @@ public class WmsEnumUtil { } } - /** - * 外部单据：移库单状态 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum OUT_MOVEMENT_STATUS { - CREATE(10, "新建"), - RECEIPT(20, "处理中"), - RECEIPT_FINISH(30, "已完成"), - CLOSED(40, "已关闭"), - CANCELLED(50, "已取消"); - - private int value; - private String description; - - OUT_MOVEMENT_STATUS(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - 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; - } - } /** * 物料：分类（ABC） @@ -1261,8 +1245,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_INFO_TYPE { - FEED(1, "进料检验"), - ONLINE(10, "在线检验"), + FEED(10, "进料检验"), + ONLINE(20, "在线检验"), EMDPRODUCT(30, "成品检验"), SHIPMENTS(40, "出货检验"); @@ -1777,6 +1761,8 @@ public class WmsEnumUtil { OP_SEQ("OP_SEQ", "作业类型序号"), TRAN_SEQ("TRAN_SEQ", "交易类型序号"), STEP_SEQ("STEP_SEQ", "步骤调用序号"), + MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"), + QC_ORDER_NO("QC_ORDER_NO", "质检单单号"), ORDER_NO("ORDER_NO", "盘点主表序号"); private String code; 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 d359972..be60f60 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 @@ -61,7 +61,7 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam(value = "状态", example = "10") public Integer snStatus; - @Column(name="SN_1D") - @ApiParam("一维条码") - public String snOneBarCode; + @Column(name="SN") + @ApiParam("条码") + public String sn; } 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 2036d64..cfb386c 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 @@ -53,10 +53,6 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("客户编号") public String custNo; - @Transient - @ApiParam(value = "需求数量", example = "0") - public Double qty; - @Column(name="TRANS_QTY") @ApiParam(value = "处理数量", example = "0") public Double transQty; @@ -127,9 +123,8 @@ public class WmsMoveDetails extends BaseBean { this.finishedCounts = finishedCounts; } - public WmsMoveDetails(String partNo, double qty ,double transQty){ + public WmsMoveDetails(String partNo, double transQty){ this.partNo = partNo; - this.qty = qty; this.transQty = transQty; } 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 b4d7163..2831670 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 @@ -76,10 +76,26 @@ public class WmsMoveSn extends BaseBean { @ApiParam(value = "源数量", example = "0") public Double srcQty; + @Column(name="SRC_WH_NO") + @ApiParam("源仓库代码") + public String srcWhNo; + + @Column(name="SRC_ZONE_NO") + @ApiParam("源存储区代码") + public String srcZoneNo; + @Column(name="SRC_LOCATE_NO") @ApiParam("源库位代码") public String srcLocateNo; + @Column(name="DEST_WH_NO") + @ApiParam("目标仓库代码") + public String destWhNo; + + @Column(name="DEST_ZONE_NO") + @ApiParam("目标存储区代码") + public String destZoneNo; + @Column(name="DEST_LOCATE_NO") @ApiParam("目标库位代码") public String destLocateNo; 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 ca40ead..59bb3ef 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 @@ -25,11 +25,11 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_QC_MASTER") +@Table(name = "WMS_QC_MASTER") @Api("质检单主表信息") public class WmsQCMaster extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; @@ -37,47 +37,47 @@ public class WmsQCMaster extends BaseBean { * 业务类型:IQC=进料检验,IPQC=在线检验, * FQC=成品检验,OQC=出货检验 */ - @Column(name="ORDER_TYPE") + @Column(name = "ORDER_TYPE") @ApiParam(value = "业务类型", example = "0") public Integer orderType; /** * 状态:1=创建,5=待处理,10=已完成,90=已关闭,91=已取消 */ - @Column(name="ORDER_STATUS") + @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") public Integer orderStatus; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String reMark; - @Column(name="CUSTOMER_NO") + @Column(name = "CUSTOMER_NO") @ApiParam("客户编号") public String customerNo; - @Column(name="VENDOR_NO") + @Column(name = "VENDOR_NO") @ApiParam("供应商编号") public String vendorNo; - @Column(name="VERSION") + @Column(name = "VERSION") @ApiParam(value = "版本", example = "1") public Integer version; - @Column(name="PO_NO") - @ApiParam("采购单号") - public String poNo; + @Column(name = "REF_TYPE") + @ApiParam("关联单号类型") + public String refType; - @Column(name="ASN_NO") - @ApiParam("ASN单号") - public String asnNo; + @Column(name = "REF_SRC") + @ApiParam("关联单号") + public String refSrc; - @Column(name="IB_NO") + @Column(name = "IB_NO") @ApiParam("入库单号") public String ibNo; @Transient - @ApiParam(value ="客户简称") + @ApiParam(value = "客户简称") private String custName; @Transient 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 fa7b83f..9b80d12 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 @@ -28,81 +28,71 @@ import javax.persistence.Table; @Api("库存交易信息") public class WmsTransQuan extends BaseBean { + @Column(name = "TRANS_NO") + @ApiParam(value = "事务编号") + private String transNo; + @Column(name = "WH_NO") - @ApiParam("仓库代码") - public String whNo; + @ApiParam(value = "仓库代码") + private String whNo; @Column(name = "ZONE_NO") - @ApiParam("存储区编号") - public String zoneNo; + @ApiParam(value = "存储区编号") + private String zoneNo; @Column(name = "LOCATE_NO") - @ApiParam("库位编号") - public String locateNo; + @ApiParam(value = "库位编号") + private String locateNo; @Column(name = "PART_NO") - @ApiParam("物料编码") - public String partNo; + @ApiParam(value = "零件编号") + private String partNo; @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name = "SN") - @ApiParam("条码") - public String sn; + @ApiParam(value = "零件名称") + private String partNameRdd; @Column(name = "UNIT") - @ApiParam("单位") - public String unit; - - /** - * 关联交易类型表 - */ - @Column(name = "TRANS_CODE") - @ApiParam(value = "交易类型代码") - public String transCode; + @ApiParam(value = "单位") + private String unit; @Column(name = "QTY") - @ApiParam(value = "交易数量", example = "0") - public Double qty; + @ApiParam(value = "交易数量", example = "1") + private Double qty; @Column(name = "REJECT_QTY") - @ApiParam(value = "不合格交易数量", example = "0") - public Double rejectQty; + @ApiParam(value = "不合格交易数量", example = "1") + private Double rejectQty; - @Column(name = "TRANS_NO") - @ApiParam(value = "事务编号") - public String transNo; + @Column(name = "TRANS_STATUS") + @ApiParam(value = "状态", example = "10") + private Integer transStatus; - /** - * ASN,PO,SO - */ @Column(name = "REF_TYPE") @ApiParam(value = "关联单据类型") - public String refType; + private String refType; + + @Column(name = "BUSI_TYPE") + @ApiParam(value = "业务类型", example = "10") + private Integer busiType; @Column(name = "REF_SRC") @ApiParam(value = "关联单号") - public String refSrc; + private String refSrc; - @Column(name = "TRANS_STATUS") - @ApiParam(value = "状态", example = "1") - public Integer transStatus; + @Column(name = "TRANS_CODE") + @ApiParam(value = "交易代码") + private String transCode; - @Column(name = "ERROR_MESSAGE") - @ApiParam(value = "错误信息") - public String errorMessage; - - @Column(name = "CUST_NO") - @ApiParam(value = "客户编号") - private String custNo; + @Column(name = "MOVE_NO") + @ApiParam(value = "库存移动单号") + private String moveNo; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") private String vendorNo; - @Column(name="MOVE_NO") - @ApiParam("移动单号") - public String moveNo; + @Column(name = "CUST_NO") + @ApiParam(value = "客户编号") + private String custNo; } 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 69ed831..048fea8 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 @@ -955,10 +955,10 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); //业务类型 HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); - //采购单号 - HqlPack.getStringEqualPack(wmsQCMaster.getPoNo(), "poNo", result); - //ASN单号 - HqlPack.getStringEqualPack(wmsQCMaster.getAsnNo(), "asnNo", result); + //关联单据类型 + HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); + //关联单据号 + HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); //入库单号 HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result);