diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java index 6c0fae6..870b7f7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.pojo.base.bean; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @Description : 基础fallback类，用于处理熔断 * @Reference : @@ -8,9 +11,27 @@ package cn.estsh.i3plus.pojo.base.bean; * @Modify: **/ public class BaseFallBackBean { + private static final Logger LOGGER = LoggerFactory.getLogger(BaseFallBackBean.class); + +// LOGGER.error("【微服出错，熔断】{}",cause.getMessage()); +// LOGGER.error("【微服出错，熔断】{}",cause.getLocalizedMessage()); +// LOGGER.error("【微服出错，熔断】{}",cause.getCause()); +// cause.printStackTrace(); + + public BaseResultBean makeBaseFallBack(Throwable cause){ + LOGGER.error("【熔断信息】{}",cause.getMessage()); + LOGGER.error("【熔断原因】{}",cause.getCause()); + return makeBaseFallBack("【微服熔断】服务暂停，请稍后再试。",cause); + } + + public BaseResultBean makeBaseFallBack(String msg,Throwable cause){ + LOGGER.error("【熔断信息】{}",cause.getMessage()); + LOGGER.error("【熔断原因】{}",cause.getCause()); + return BaseResultBean.buildBaseResultBean(false,cause.getMessage() + "，信息：" + msg); + } public BaseResultBean makeBaseFallBack(){ - return makeBaseFallBack("服务暂停"); + return makeBaseFallBack("【微服熔断】服务暂停，请稍后再试。"); } public BaseResultBean makeBaseFallBack(String msg){ 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 80aec01..f6da59e 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 @@ -958,16 +958,21 @@ public class WmsEnumUtil { } /** - * 库存条码表条码质量状态 + * ASN单据状态 10=新建,20=收货中,30=收货完成，40=已关闭,50=已取消 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SN_QUALITY_STATUS { - NORMAL(10, "合格"), ABNORMAL(20, "不合格"), ISOLATED(30, "隔离"); + public enum ASN_STATUS { + + CREATE(10, "新建"), + RECEIPT(20, "收货中"), + RECEIPT_FINISH(30, "收货完成"), + CLOSED(40, "已关闭"), + CANCELLED(50, "已取消"); private int value; private String description; - SN_QUALITY_STATUS(int value, String description) { + ASN_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -991,6 +996,7 @@ public class WmsEnumUtil { } } + /** * 业务表：库存条码状态 * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 @@ -1048,15 +1054,15 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_QC_STATUS { - QUALIFIED(10, "合格"), - UNQUALIFIED(20, "不合格"), - QUAEANTINE(30, "隔离"); + NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"); private int value; + private String code; private String description; - STOCK_SN_QC_STATUS(int value, String description) { + STOCK_SN_QC_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -1068,6 +1074,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++) { @@ -1087,6 +1097,15 @@ public class WmsEnumUtil { } return tmp; } + public static STOCK_SN_QC_STATUS codeOf(Integer value) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } } /** @@ -2013,49 +2032,4 @@ public class WmsEnumUtil { return null; } } - - /** - * 数据状态 - * 1 启用 - * 2 禁用 - * 3 全部 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DATA_STATUS { - ENABLE(1, "启用", "fa fa-success cell-fa fa-check"), - DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle"), - LOCKING(3, "全部", "fa cell-fa fa-lock"); - - private int value; - private String code; - private String description; - - DATA_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].getCode(); - } - } - return tmp; - } - } } 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 2e4c55f..179c7b6 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 @@ -34,18 +34,10 @@ public class WmsASNMaster extends BaseBean { @ApiParam("订单号") public String orderNo; - /** - * 单据类型:REG=原物料采购, - * SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购 - */ @Column(name = "ASN_TYPE") @ApiParam("单据类型") public String asnType; - /** - * 状态:1=新建,10=收货中,20=收货完成, - * 30=入库中,40=入库完成,90=已关闭,91=已取消 - */ @Column(name = "ASN_STATUS") @ApiParam(value = "状态", example = "0") public Integer asnStatus; @@ -74,7 +66,4 @@ public class WmsASNMaster extends BaseBean { @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 ff1b98b..640d69e 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 @@ -56,11 +56,11 @@ public class WmsASNMasterDetails extends BaseBean { @ApiParam("PO行号") public String poItem; - @Column(name = "ZDATE") + @Column(name = "PLAN_DATE") @ApiParam("计划交货日期") public String planDate; - @Column(name = "ZTIME") + @Column(name = "PLAN_TIME") @ApiParam("计划交货时间") public String planTime; @@ -110,16 +110,4 @@ public class WmsASNMasterDetails extends BaseBean { @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/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 2568b63..ff54102 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 @@ -79,13 +79,13 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "条码打印数量", example = "1") private Double printQty; - @Column(name = "ZDATE") + @Column(name = "PLAN_DATE") @ApiParam(value = "计划日期") - private String zdate; + private String planDate; - @Column(name = "ZTIME") + @Column(name = "PLAN_TIME") @ApiParam(value = "计划时间") - private String ztime; + private String planTime; @Column(name = "SRC_NO") @ApiParam(value = "源单号") 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 b895877..f11f782 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 @@ -55,9 +55,9 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "状态", example = "1") public Integer orderStatus; - @Column(name = "CUSTOMER_NO") + @Column(name = "CUST_NO") @ApiParam(value = "客户编号") - private String customerNo; + private String custNo; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") 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 9663b9f..8c1eae2 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 @@ -52,9 +52,9 @@ public class WmsQCMaster extends BaseBean { @ApiParam("备注") public String remark; - @Column(name = "CUSTOMER_NO") + @Column(name = "CUST_NO") @ApiParam("客户编号") - public String customerNo; + public String custNo; @Column(name = "VENDOR_NO") @ApiParam("供应商编号") 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 6b0c494..72983b8 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 @@ -116,7 +116,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result); HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result); - HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustomerNo(), "customerNo", result); + HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", result); getStringBuilderPack(wmsDocMovementMaster, result); @@ -802,6 +802,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result); HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result); getStringBuilderPack(wmsStockQuan, result); @@ -872,6 +873,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result); + HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); getStringBuilderPack(wmsMoveMaster, result); @@ -1408,9 +1410,6 @@ public class WmsHqlPack { */ public static String packHqlWmsDataAuthFind(WmsDataAuth wmsDataAuth) { StringBuffer result = new StringBuffer(); - if (!Strings.isNullOrEmpty(wmsDataAuth.getOrganizeCode())){ - HqlPack.getStringEqualPack(wmsDataAuth.getOrganizeCode(),"organizeCode",result); - } if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())){ HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(),"roleCode",result); }