diff --git a/oms_web/oms_vue/src/views/inventory/execution/index.vue b/oms_web/oms_vue/src/views/inventory/execution/index.vue index 7eac2f21..929774f6 100644 --- a/oms_web/oms_vue/src/views/inventory/execution/index.vue +++ b/oms_web/oms_vue/src/views/inventory/execution/index.vue @@ -274,9 +274,9 @@
已备货: {{ item.bhNum !== undefined && item.bhNum !== null ? item.bhNum : '-' }} - 缺货: {{ Number(item.orderNum) - Number(item.bhNum || 0) }} - 超配: {{ Number(item.bhNum) - Number(item.orderNum) }} - 备货完成 + 缺货: {{ Number(item.orderNum) - Number(item.bhNum || 0) }} + 超配: {{ Number(item.bhNum) - Number(item.orderNum) }} + 备货完成
diff --git a/oms_web/oms_vue/src/views/login.vue b/oms_web/oms_vue/src/views/login.vue index dcb2a68b..da50c62f 100644 --- a/oms_web/oms_vue/src/views/login.vue +++ b/oms_web/oms_vue/src/views/login.vue @@ -81,7 +81,15 @@ {{ emailCodeCountdown > 0 ? emailCodeCountdown + '秒后重发' : '发送验证码' }} -
密码长度8-20位，需包含大小写字母、数字、特殊字符
+
+
密码长度8-20位，以下规则中至少满足 3 种：
+ +
提 交 @@ -129,7 +137,7 @@ export default { newPassword: [ { required: true, trigger: "blur", message: "请输入新密码" }, { min: 8, max: 20, trigger: "blur", message: "密码长度为8到20个字符" }, - { pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]).{8,20}$/, trigger: "blur", message: "密码需包含大小写字母、数字、特殊字符" } + { pattern: /^(?=.{8,20}$)(?:(?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9])).*$/, trigger: "blur", message: "不符合密码规则" } ], confirmPassword: [ { required: true, trigger: "blur", message: "请确认新密码" }, diff --git a/oms_web/oms_vue/src/views/system/user/profile/resetPwd.vue b/oms_web/oms_vue/src/views/system/user/profile/resetPwd.vue index cafe812c..409603c7 100644 --- a/oms_web/oms_vue/src/views/system/user/profile/resetPwd.vue +++ b/oms_web/oms_vue/src/views/system/user/profile/resetPwd.vue @@ -9,6 +9,15 @@ +
+
密码长度8-20位，以下规则中至少满足 3 种：
+ +
保存 关闭 @@ -42,7 +51,7 @@ export default { newPassword: [ { required: true, trigger: "blur", message: "请输入新密码" }, { min: 8, max: 20, trigger: "blur", message: "密码长度为8到20个字符" }, - { pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]).{8,20}$/, trigger: "blur", message: "密码需包含大小写字母、数字、特殊字符" } + { pattern: /^(?=.{8,20}$)(?:(?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9])).*$/, trigger: "blur", message: "不符合密码规则" } ], confirmPassword: [ { required: true, message: "确认密码不能为空", trigger: "blur" }, @@ -74,3 +83,12 @@ export default { } } + + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index 87859e21..05ab61d9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -169,7 +169,7 @@ public class SysLoginController extends BaseController } if (!passwordService.isStrongPassword(newPassword)) { - return error("新密码长度为8-20位，且需包含大小写字母、数字、特殊字符"); + return error("新密码不符合规则"); } SysUser user = userService.selectUserByLoginName(username); if (user == null) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java index 458f7373..84f17d42 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java @@ -53,7 +53,7 @@ public class UserConstants public static final int PASSWORD_MIN_LENGTH = 5; public static final int PASSWORD_MAX_LENGTH = 20; - public static final String PASSWORD_COMPLEXITY_PATTERN = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[^A-Za-z0-9]).{8,20}$"; + public static final String PASSWORD_COMPLEXITY_PATTERN = "^(?=.{8,20}$)(?:(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\\d)(?=.*[^A-Za-z0-9])).*$"; /** * 用户类型 diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java index cb0a4c35..7910cb13 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java @@ -3001,16 +3001,13 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To .allMatch(item -> item.getOrderNum() != null && item.getOrderNum() > 0 && item.getBhNum() != null && item.getBhNum() >= item.getOrderNum()); - String stockingStatus = null; - if (!deliveryCompleted) { - stockingStatus = ProjectOrderInfo.OrderStockingStatusEnum.PHZ.getCode(); - } else { + String stockingStatus = ProjectOrderInfo.OrderStockingStatusEnum.PHZ.getCode(); + if (deliveryCompleted) { stockingStatus = ProjectOrderInfo.OrderStockingStatusEnum.YPH.getCode(); - if (hasStocking && !stockingCompleted) { - stockingStatus = ProjectOrderInfo.OrderStockingStatusEnum.BFBH.getCode(); - } - if (stockingCompleted) { + if (CollUtil.isEmpty(stockingProductList) || stockingCompleted) { stockingStatus = ProjectOrderInfo.OrderStockingStatusEnum.BHWC.getCode(); + } else if (hasStocking) { + stockingStatus = ProjectOrderInfo.OrderStockingStatusEnum.BFBH.getCode(); } } projectOrderInfoMapper.updateOrderStockingStatusByCode(orderCode, stockingStatus);