From 8d66424bf611202271a37d1e5dcd62fa461faaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 5 Nov 2020 13:47:13 +0800 Subject: [PATCH 01/11] =?UTF-8?q?fix(form):=E5=88=86=E9=A1=B5=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java index 9f449f4..80a2fb7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java @@ -96,7 +96,7 @@ public class PagerHelper { } int startRow = (pager.getCurrentPage() - 1) * pager.getPageSize(); - pager.setStartRow(startRow == 0 ? 1 : startRow); + pager.setStartRow(startRow); int endRow; if (startRow + pager.getPageSize() <= rowCount) { From 26e1b391198f03e631bf0d2cf7c68397cbda8223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 9 Nov 2020 14:39:04 +0800 Subject: [PATCH 02/11] =?UTF-8?q?feat(core):=E9=82=AE=E4=BB=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E9=99=84=E4=BB=B6=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/platform/bean/SysMessage.java | 16 +++++++++++++++- .../estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 ++ .../estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 14 ++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) 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 394088d..75a8fea 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 @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.ArrayList; import java.util.List; /** @@ -50,10 +51,11 @@ public class SysMessage extends BaseBean { if (this.messageType == null) { return 0; } else { - return this.messageType.intValue(); + return this.messageType; } } + @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_TYPE_CONTENT.class) @Column(name = "MESSAGE_TYPE_CONTENT") @ApiParam(value = "消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)", example = "-1") private Integer messageContentType; @@ -154,4 +156,16 @@ public class SysMessage extends BaseBean { @ApiParam(value = "附件集合") private List sysFileAttachList; + @Transient + @ApiParam(value = "附件id集合") + private List fileAttachIdList; + + public void addFileAttachId(Long attachId){ + if(fileAttachIdList == null){ + fileAttachIdList = new ArrayList<>(); + } + + fileAttachIdList.add(attachId); + } + } 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 a472e9f..694c194 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 @@ -476,6 +476,7 @@ public class CoreHqlPack { DdlPreparedPack.getNumEqualPack(message.getSendStatus(), "sendStatus", ddlPackBean); DdlPreparedPack.getOrderDefault(message); + ddlPackBean.setOrderByStr(message.orderBy()); return ddlPackBean; } @@ -487,6 +488,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysFile(SysFile file) { + DdlPreparedPack.getOrderDefault(file); DdlPackBean result = DdlPackBean.getDdlPackBean(file); // hql拼接 diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java index bce2e0d..1945d75 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java @@ -10,6 +10,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -120,6 +121,19 @@ public class BsSuitCaseFTP extends BaseBean { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsIncrementalWriteVal()); } + @ColumnDefault("2") + @Column(name = "IS_CHECK_FILE") + @ApiParam(value = "是否校验文件") + private Integer isCheckFile; + + public boolean isCheckFile(){ + return isCheckFile != null && CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isCheckFile); + } + + @Column(name = "CHECK_FILE_PATH") + @ApiParam(value = "校验文件路径") + private String checkFilePath; + @Transient @ApiParam(value = "临时适配路径") private String tempSuitFilePath; From 39da900ae1549337340acb24bbe5d9f4a5c477b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 9 Nov 2020 15:40:35 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 486deb5..8bcab46 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -53,11 +53,8 @@ public class MgnBoardListModel { @ApiParam("车间") private String areaCode; - @ApiParam("绿线值") - private Double planPassYield; - - @ApiParam("上下偏差值") - private Double yieldDiffValue; + @ApiParam("颜色") + private String color; @ApiParam("产线集合") private List workCenterList; From 2911abf1934fa69ce8899799dc860f0e3e97cf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 9 Nov 2020 18:06:17 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E3=80=9012324=2020027-PCN=E7=AB=AF-?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86-=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E5=B7=B2=E7=BB=8F=E5=81=9C=E7=BA=BF=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E5=9C=A8=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E7=82=B9=E5=87=BB=E6=9A=82=E5=81=9C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=8F=90=E7=A4=BA=E2=80=9C90003:=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E3=80=901545=E3=80=91=E9=9C=80=E8=A6=81=E5=9C=A8?= =?UTF-8?q?=E5=81=9C=E7=BA=BF=E6=97=B6=E6=89=8D=E5=85=81=E8=AE=B8=E6=9A=82?= =?UTF-8?q?=E5=81=9C[=E8=AF=B7=E6=A3=80=E6=9F=A5]=E2=80=9D-20201109?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/IfCustOrderData.java | 83 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java | 4 ++ .../mes/repository/IfCustOrderDataRepository.java | 9 +++ 3 files changed, 96 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java new file mode 100644 index 0000000..2d8aa20 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.mes.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.ColumnDefault; +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.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Description :IF_客户月度订单数据 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-11-06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_CUST_ORDER_DATA") +@Api("IF_客户月度订单数据") +public class IfCustOrderData extends BaseBean implements Serializable { + private static final long serialVersionUID = 855289009053695346L; + + @Column(name = "RGANIZTION_CODE") + @ApiParam("工厂代码") + private String rganiztionCode; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "CUSTOMER_NAME") + @ApiParam("客户名称") + private String customerName; + + @Column(name = "YEAR") + @ApiParam("年") + private Integer year; + + @Column(name = "MONTH") + @ApiParam("月") + private Integer month; + + @Column(name = "QTY") + @ApiParam("订单数量") + private Integer qty = 0; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Transient + @ApiParam("年度客户月度订单集合") + private List> ifCustOrderDataMap = new ArrayList<>(); +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java index 129d45e..cfaf6f5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java @@ -57,4 +57,8 @@ public class MesCustomer extends BaseBean implements Serializable { @Column(name = "CUST_DELIVERY_LOCATION") @ApiParam("客户发往地") private String custDeliveryLocation; + + @Column(name = "IS_BI_DISPLAY") + @ApiParam("是否BI显示") + private Integer isBiDisplay = 2; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java new file mode 100644 index 0000000..47b1a16 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfCustOrderData; +import org.springframework.stereotype.Repository; + +@Repository +public interface IfCustOrderDataRepository extends BaseRepository { +} From 426a6f2026b5ab12014436f4c49c739e50b025e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 9 Nov 2020 19:00:34 +0800 Subject: [PATCH 05/11] =?UTF-8?q?feat(ftp):ftp=E9=87=8D=E8=AF=95=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 6ff8a9c..19f713f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -936,9 +936,9 @@ public class BlockSoftSwitchEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FTP_CONNECTION_MODE { LOCAL_ACTIVE_MODE(10, "本地主动模式"), - LOCAL_PASSIVE_MODE(20, "本地被动模式"), + LOCAL_PASSIVE_MODE(20, "本地被动模式"); // REMOTE_ACTIVE_MODE(30, "远程主动模式"), - REMOTE_PASSIVE_MODE(40, "远程被动模式"); +// REMOTE_PASSIVE_MODE(40, "远程被动模式"); private final int value; private final String description; From 4d5ffce7ac0798bf8681712f831b31b1213760d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 9 Nov 2020 19:21:47 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2933?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 4 ++++ 1 file changed, 4 insertions(+) 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 6def198..b57e05f 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 @@ -76,6 +76,10 @@ public class WmsStockQuan extends BaseBean { private Boolean includeZeroStock = false; @Transient + @ApiParam(value = "无差异库存显示") + private Boolean showNoDiffStock = false; + + @Transient @ColumnDefault("0") @ApiParam(value = "库存数量总和") private Double sumQty; From 7dba4e7f322802192d32b49b91008c1bbe4077ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 9 Nov 2020 19:22:50 +0800 Subject: [PATCH 07/11] BUG#12166 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 3 +++ 1 file changed, 3 insertions(+) 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 b8df6db..86f2fe7 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 @@ -127,6 +127,9 @@ public class WmsLocatePart extends BaseBean { public double getMinValue(){ return this.min ==null?0:this.min.doubleValue(); } + public double getSafetyStockVal(){ + return this.safetyStock ==null?0:this.safetyStock.doubleValue(); + } public WmsLocatePart() { } From d41d14b1125eac124547b65b87b6fdc718d7f79e Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Mon, 9 Nov 2020 20:27:55 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20erp=20doc=20no=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/dbinterface/WmsInterfaceDataRecord.java | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java index c060cd6..99798d6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java @@ -33,7 +33,7 @@ import javax.persistence.Table; @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "SRC_TABLE_NAME"), @Index(columnList = "DEST_BEAN_NAME"), - @Index(columnList = "SOFT_ADAPATOR_CODE"), + @Index(columnList = "SOFT_ADAPTOR_CODE"), @Index(columnList = "SID"), @Index(columnList = "MOVE_TO_ERP_ID") }) @@ -43,35 +43,39 @@ public class WmsInterfaceDataRecord extends BaseBean { @ApiParam("来源表名") @Column(name = "SRC_TABLE_NAME", length = 50) - public String srcTableName; + private String srcTableName; @ApiParam("目标实体对象的名字，多个字段用半角逗号分隔") @Column(name = "DEST_BEAN_NAME", length = 500) - public String destBeanName; + private String destBeanName; @ApiParam("软适配编号") - @Column(name = "SOFT_ADAPATOR_CODE") - public String softAdaptorCode; + @Column(name = "SOFT_ADAPTOR_CODE") + private String softAdaptorCode; @ApiParam("接口名称") @Column(name = "INTERFACE_NAME") - public String interfaceName; + private String interfaceName; @ApiParam("报文唯一编号") @Column(name = "SID") - public Long sid; + private Long sid; @ApiParam("MOVE_TO_ERP表的ID") @Column(name = "MOVE_TO_ERP_ID") - public Long moveToErpID; + private Long moveToErpID; @ApiParam("报文校验状态") @Column(name = "VERIFY_STATUS") @ColumnDefault("10") @AnnoOutputColumn(refClass = WmsEnumUtil.INTERFACE_DATA_VERIFY_STATUS.class, refForeignKey = "value", value = "description", required = false) - public int verifyStatus; + private int verifyStatus; @ApiParam("备注信息") @Column(name = "REMARK") - public String remark; + private String remark; + + @ApiParam("ERP文档编号") + @Column(name = "ERP_DOC_NO") + private String erpDocNo; } From 71e70e9a9453dc4394b749d98e8da1a0f71f4c91 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 9 Nov 2020 20:31:03 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=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/wms/bean/WmsLocate.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 3a2c1e7..3fd7418 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 @@ -240,6 +240,18 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @ApiParam(value = "不等于库位类型") private Integer notLocateType; + @Transient + @ApiParam(value = "总库位") + private Integer totalQty; + + @Transient + @ApiParam(value = "已用库位") + private Integer usedQty; + + @Transient + @ApiParam(value = "空库位") + private Integer emptyQty; + public WmsLocate() { } From 755d66dbce6287ff562f95206bb43d4fc6137826 Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 10 Nov 2020 10:47:29 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=B8=AD=E8=88=AA-=E5=81=9C=E7=BA=BF?= =?UTF-8?q?=E6=97=B6=E6=A0=B9=E6=8D=AE=E5=B7=A5=E5=8D=95=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E2=80=9C=E5=B7=A1=E6=A3=80=E9=A1=B9=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=98=8E=E7=BB=86=E8=A1=A8=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java index e49d31d..6840515 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java @@ -16,7 +16,7 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description: + * @Description: MES_QC_ORDER_DETAIL表的明细表 * @Reference: * @Author: jessica.chen * @CreateDate: 2019\11\15 10:01 From 7ec1bc61b029ceaba9c4d191d3eb9bacca841a11 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 10 Nov 2020 11:26:32 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=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/wms/bean/WmsDocMovementDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3d469ee..3dec39f 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 @@ -114,7 +114,7 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam(value = "紧急程度") - private String urgentStatus; + private Integer urgentStatus; @Column(name = "SRC_NO") @ApiParam(value = "源单号")