From f1cbc90bd1d7afcd3df460ac617c1cc899446892 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 7 Dec 2022 09:21:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7shiro=201.4.0=20=E5=88=B0?= =?UTF-8?q?1.10.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 478033a..f75494e 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ org.apache.shiro shiro-core - 1.4.0 + 1.10.1 From facd1a4ee42604e0cf594d8e9d4150228ae4188f Mon Sep 17 00:00:00 2001 From: "zhang.xw" Date: Wed, 7 Dec 2022 20:49:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=80=92=E5=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 021e734..3f01cd0 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -403,7 +403,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getStringEqualPack(suitCaseCode,"suitCaseCodeRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"createDatetime"},ddlPackBean); return ddlPackBean; } From f712617cc019138104ec2474b2f543cd75b1d1d7 Mon Sep 17 00:00:00 2001 From: jiaqihou Date: Fri, 9 Dec 2022 12:50:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90add=20=E5=BA=93=E5=AD=98=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=A1=A8=EF=BC=88WmsStockSn=EF=BC=89=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=EF=BC=88prodPickingInStock?= =?UTF-8?q?Time=EF=BC=89=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) 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 bceef8b..343b569 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 @@ -625,6 +625,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("90以上天") private double morhanDays; + @Column(name = "PROD_PICKING_IN_STOCK_TIME") + @ApiParam(value = "生产领料入库时间") + public String prodPickingInStockTime; + public WmsStockSn(String zoneNo, String lotNo, String partNo, double thirtyDays, double thirtyToSixtyDays, double sixtyToNinetyDays, double morhanDays) { this.zoneNo=zoneNo; this.lotNo=lotNo; From e6166ab73085c5e0dd2ca70e6a6ecb7e05dbb89c Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Sun, 11 Dec 2022 10:00:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=AE=B0=E5=BD=95=E9=97=AE=E9=A2=98---fixbug?= =?UTF-8?q?=2028898?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 1 + .../pojo/platform/model/SysVersionExportModel.java | 22 +++++++++++++++ .../pojo/platform/model/SysVersionModel.java | 33 ++++++++++++++++++++++ .../repository/SysOrderNoRuleRepository.java | 2 ++ 4 files changed, 58 insertions(+) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionExportModel.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionModel.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index fd2f42a..c877076 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -130,6 +130,7 @@ public class SysUser extends BaseBean { @Column(name = "RESET_PASSWORD_TIME") @ApiParam(value = "重置密码的时间") private String resetPasswordTime; + /********************************** 关系信息 ********************************/ @Column(name = "DEPARTMENT_ID") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionExportModel.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionExportModel.java new file mode 100644 index 0000000..e8fd6a0 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionExportModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.platform.model; + +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/12/10 18:04 + * @Modify: + **/ +@Data +public class SysVersionExportModel { + + private String startDate; + + private String endDate; + + private String userName; + + private Long roleId; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionModel.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionModel.java new file mode 100644 index 0000000..3e7bd09 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.platform.model; + +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/12/10 15:56 + * @Modify: + **/ +@Data +public class SysVersionModel { + /** + * sys_version_plan_id + */ + private Long planId; + + private String modifyDateTimeStart; + + private String modifyDateTimeEnd; + /** + * 差异 + */ + private String pojoCompare; + + private Long refId; + + /** + * 角色id + */ + private Long roleId; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRuleRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRuleRepository.java index b5569fa..24e293b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRuleRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRuleRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; +import org.springframework.stereotype.Repository; /** * @Description : 单号规则 @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; * @CreateDate : 2018-11-21 17:15 * @Modify: **/ +@Repository public interface SysOrderNoRuleRepository extends BaseRepository { }