From 6539c548fb75d85000257982bfe82a5086165e08 Mon Sep 17 00:00:00 2001 From: z Date: Mon, 15 Sep 2025 18:56:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseOrderNoDetailMapper.java | 1 + .../controller/admin/user/UserController.java | 14 +- .../system/service/user/AdminUserService.java | 2 + .../service/user/AdminUserServiceImpl.java | 13 ++ .../src/api/system/user/index.ts | 4 +- .../src/views/heli/deliverorder/detail.vue | 4 +- .../heli/deliverorder/shipmentsPrint.vue | 177 +++++++++++++----- .../src/views/heli/partpurchase/index.vue | 11 +- .../heli/purchaseorderno/partReceived.vue | 23 ++- 9 files changed, 183 insertions(+), 66 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java index b8388f4a..ec8b8fae 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java @@ -245,6 +245,7 @@ public interface PurchaseOrderNoDetailMapper extends BaseMapperX isAdministrator() { + return success(userService.isAdministrator()); + } @GetMapping("/getDeptId") @Operation(summary = "根据部门获取用户") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserService.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserService.java index 99bf4201..ab3c7b7c 100644 --- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserService.java +++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserService.java @@ -206,4 +206,6 @@ public interface AdminUserService { List getUserListByDeptName(String name); List getList(); + + Boolean isAdministrator(); } diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserServiceImpl.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserServiceImpl.java index fe9098f3..3f0d6b1f 100644 --- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserServiceImpl.java +++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserServiceImpl.java @@ -20,8 +20,10 @@ import com.chanko.yunxi.mes.module.system.controller.admin.user.vo.user.UserPage import com.chanko.yunxi.mes.module.system.controller.admin.user.vo.user.UserSaveReqVO; import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.DeptDO; import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.UserPostDO; +import com.chanko.yunxi.mes.module.system.dal.dataobject.permission.UserRoleDO; import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; import com.chanko.yunxi.mes.module.system.dal.mysql.dept.UserPostMapper; +import com.chanko.yunxi.mes.module.system.dal.mysql.permission.UserRoleMapper; import com.chanko.yunxi.mes.module.system.dal.mysql.user.AdminUserMapper; import com.chanko.yunxi.mes.module.system.service.dept.DeptService; import com.chanko.yunxi.mes.module.system.service.dept.PostService; @@ -43,6 +45,7 @@ import java.util.*; import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.chanko.yunxi.mes.framework.common.util.collection.CollectionUtils.convertList; import static com.chanko.yunxi.mes.framework.common.util.collection.CollectionUtils.convertSet; +import static com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; import static com.chanko.yunxi.mes.module.system.enums.ErrorCodeConstants.*; /** @@ -74,6 +77,8 @@ public class AdminUserServiceImpl implements AdminUserService { @Resource private UserPostMapper userPostMapper; + @Resource + private UserRoleMapper userRoleMapper; @Resource private FileApi fileApi; @@ -461,6 +466,14 @@ public class AdminUserServiceImpl implements AdminUserService { return userMapper.selectList(wrapper); } + @Override + public Boolean isAdministrator() { + LambdaQueryWrapper userRoleDOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + userRoleDOLambdaQueryWrapper.eq(UserRoleDO::getUserId,getLoginUser().getId()); + userRoleDOLambdaQueryWrapper.eq(UserRoleDO::getRoleId,3); + return userRoleMapper.selectCount(userRoleDOLambdaQueryWrapper)>0; + } + /** * 对密码进行加密 * diff --git a/mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts index 738fbf84..195f1b82 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts @@ -88,7 +88,9 @@ export const updateUserStatus = (id: number, status: number) => { export const getSimpleUserList = (): Promise => { return request.get({ url: '/system/user/simple-list' }) } - +export const isAdministrator = () => { + return request.get({ url: '/system/user/isAdministrator'}) +} export const getSimpleUserName = async (id: number) => { const user = await getUser(id); return user.nickname; diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue index 2eb48aeb..84717c90 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue @@ -68,7 +68,7 @@ - + @@ -261,7 +261,7 @@ - 新增 + 新增 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue index dfb4f4c3..cfa257e6 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue @@ -62,8 +62,10 @@ 尺寸(米) 备注 - - {{ item.name }} + + {{ item.name }} + 备件:{{ item.name }} + 刀具:{{ item.name }} {{ getDictLabel(DICT_TYPE.HELI_MATERIAL_UNIT, item.unit) }} {{ item.amount }} {{ item.weight }} @@ -71,7 +73,15 @@ {{ item.remark }} - 工装模具详见清单附件 + 详见清单附件 + + + + + + + +   @@ -79,22 +89,12 @@ - 附光盘+各类报告 - - - - - - - - - -   - - - - - + {{formData.remark?formData.remark:' '}} + + + + + @@ -136,7 +136,7 @@
- +
- + @@ -204,24 +204,15 @@ - + - - - - - - - - - - - + + @@ -229,7 +220,16 @@ + + + + + + + + + - - - @@ -313,30 +388,20 @@ - - - - - - @@ -380,7 +445,6 @@
@@ -195,7 +195,7 @@ 尺寸(米) 备注
{{ item.name }} {{ getDictLabel(DICT_TYPE.HELI_MATERIAL_UNIT, item.unit) }} {{ item.amount }}{{ item.remark }}
工装模具详见清单附件详见清单附件
附光盘+各类报告
 
{{formData.remark?formData.remark:' '}}
发货单位 @@ -273,7 +273,87 @@ 制单人：{{ formData.creatorName }} -回单联- + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + 清单附件 + 发货编号：{{ formData.code }} +
+
序号 + 模具名称 + 模具图号 数量(套) 备注
{{ index + 1 }} {{ item.name }}{{ item.blueprintNo }} {{ item.amount }} {{ item.remark }}
{{ index + 1 }} + 备件:{{ item.name }} + {{ item.blueprintNo }} {{ item.amount }} {{ item.remark }}
{{ index + 1 }} + 刀具:{{ item.name }} + {{ item.blueprintNo }} {{ item.amount }} {{ item.remark }}
  +
+
内部货物门点人签名:
+
+
+ 制单人：{{ formData.creatorName }} + -客户联- +
+
@@ -300,11 +380,6 @@
数量(套) 备注
-
模具清单
-
{{ index + 1 }} {{ item.name }}{{ item.remark }}
-
备件清单
-
{{ index + 1 }} - {{ item.name }} + 备件:{{ item.name }} {{ item.blueprintNo }} {{ item.amount }} {{ item.remark }}
-
刀具清单
-
{{ index + 1 }} - {{ item.name }} + 刀具:{{ item.name }} {{ item.blueprintNo }} {{ item.amount }}