From d2e51a44e0349e160a9823d5adcc2367c89c1043 Mon Sep 17 00:00:00 2001 From: psh Date: Mon, 29 Apr 2024 16:46:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E9=9C=80=E6=B1=82fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ssx_site/SsxSiteDeviceDriver.java | 7 +- .../MobileAuthorizationController.java | 22 +- .../service/user/dao/mapper/SysUserMapper.xml | 3 + .../wms/board/service/dao/dto/WuliaoDto.java | 2 + .../board/service/dao/mapper/BoardMapper.xml | 15 +- .../nl/wms/mes/controller/MesController.java | 8 +- .../nl/wms/pda/controller/PdaController.java | 1 + .../service/dao/mapper/MaterialMapper.xml | 6 - .../controller/SchBasePointController.java | 23 +- .../point/service/ISchBasePointService.java | 2 +- .../sch/point/service/dao/SchBasePoint.java | 5 + .../service/impl/SchBasePointServiceImpl.java | 4 +- .../nl/wms/sch/report/ReportController.java | 35 ++ .../sch/report/service/IReportService.java | 20 ++ .../service/dao/mapper/ReportMapper.java | 23 ++ .../service/dao/mapper/ReportMapper.xml | 26 ++ .../wms/sch/report/service/dto/ReportDto.java | 15 + .../sch/report/service/dto/ReportQuery.java | 23 ++ .../service/impl/ReportServiceImpl.java | 40 +++ .../sch/task_manage/task/tasks/YCLCKTask.java | 9 +- .../src/views/wms/sch/point/index.vue | 2 + .../src/views/wms/sch/report/index.vue | 333 ++++++++++++++++++ .../src/views/wms/sch/report/report.js | 35 ++ 23 files changed, 635 insertions(+), 24 deletions(-) delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/mapper/MaterialMapper.xml create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportDto.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java create mode 100644 lms/nladmin-ui/src/views/wms/sch/report/index.vue create mode 100644 lms/nladmin-ui/src/views/wms/sch/report/report.js diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java index c63ec72..69cdf48 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; import org.nl.acs.device.domain.Device; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; @@ -301,8 +302,10 @@ public class SsxSiteDeviceDriver extends AbstractOpcDeviceDriver implements Devi this.apply(7); break; case 8: - log.info("满料出库"); - this.apply(8); + if(ObjectUtils.isNotEmpty(sub_tray)&&ObjectUtils.isNotEmpty(mother_tray)) { + log.info("满料出库"); + this.apply(8); + } break; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java index 30157e7..c130f71 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java @@ -11,15 +11,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.logging.annotation.Log; import org.nl.common.utils.RsaUtils; +import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.dto.CurrentUser; import org.nl.config.RsaProperties; import org.nl.system.service.role.ISysRoleService; +import org.nl.system.service.role.dao.SysRole; import org.nl.system.service.secutiry.dto.AuthUserDto; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; +import org.nl.system.service.user.dao.mapper.SysUserMapper; +import org.nl.system.service.user.dto.SysUserDetail; +import org.nl.system.service.user.dto.UserQuery; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.springframework.beans.factory.annotation.Autowired; @@ -49,7 +55,6 @@ public class MobileAuthorizationController { private ISysUserService userService; @Autowired private ISysRoleService roleService; - @ApiOperation("登录授权") @PostMapping(value = "/login") @SaIgnore @@ -63,9 +68,9 @@ public class MobileAuthorizationController { if (ObjectUtil.isEmpty(userInfo) || !userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, "salt"))) { // 这里需要密码加密 throw new BadRequestException("账号或密码错误！"); } + // 获取权限列表 - 登录查找权限 List permissionList = roleService.getPermissionList((JSONObject) JSON.toJSON(userInfo)); - if (!userInfo.getIs_used()) { throw new BadRequestException("账号未激活"); } @@ -83,14 +88,25 @@ public class MobileAuthorizationController { .setDevice("PE") // 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型 .setExtra("loginInfo", user) // Token挂载的扩展参数 （此方法只有在集成jwt插件时才会生效） ); - + UserQuery query=new UserQuery(); + query.setBlurry(user.getUsername()); + PageQuery page=new PageQuery(); + List userDetail = userService.getUserDetail(query, page); + String roles=""; + for(SysRole role:userDetail.get(0).getRoles()){ + if(ObjectUtil.isNotEmpty(role.getRemark())){ + roles+=role.getRemark()+','; + } + } // 返回 token 与 用户信息 JSONObject jsonObject = new JSONObject(); // jsonObject.put("roles", permissionList); jsonObject.put("user", userInfo); + String finalRoles = roles; JSONObject authInfo = new JSONObject(2) {{ put("token", "Bearer " + StpUtil.getTokenValue()); put("user", jsonObject); + put("roles", finalRoles); }}; return ResponseEntity.ok(authInfo); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml index 719c300..a871fc6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml @@ -58,6 +58,7 @@ + - select productDescription as name,count(*) as number - from sch_base_material - GROUP BY productDescription - limit 5 + SELECT + a.NAME, + a.number, + FLOOR( a.number / b.sum * 100 ) AS percentage + FROM + ( SELECT productDescription AS NAME, count(*) AS number FROM sch_base_material GROUP BY productDescription ) a,( + SELECT + count(*) AS sum + FROM + sch_base_material + ) b + SELECT + p.point_code as pointCode, + m.productDescription, + m.supplierName + FROM + sch_base_point p + LEFT JOIN sch_base_material m ON p.vehicle_code2 = m.lotSN + WHERE + region_code IN ( 'HW', 'HWK' ) + AND vehicle_code2 IS NOT NULL + AND vehicle_code2 != '' + + and m.supplierName like CONCAT('%', #{query.supplierName}, '%') + + + and m.productDescription like CONCAT('%', #{query.productDescription}, '%') + + ORDER BY point_code ASC + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportDto.java new file mode 100644 index 0000000..cecbd0e --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportDto.java @@ -0,0 +1,15 @@ +package org.nl.wms.sch.report.service.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ReportDto implements Serializable { + /** 点位编码 */ + private String pointCode; + /** 物料名称 */ + private String productDescription; + /** 供应商名称 */ + private String supplierName; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java new file mode 100644 index 0000000..2cd10b6 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java @@ -0,0 +1,23 @@ +package org.nl.wms.sch.report.service.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ReportQuery implements Serializable { + //托盘号 + private String palletSN; + //物料条码号 + private String lotSN; + //物料名称 + private String productName; + //供应商编码 + private String productDescription; + //供应商编码 + private String supplierCode; + //供应商名称 + private String supplierName; + //绑定状态 + private String group_bind_material_status; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java new file mode 100644 index 0000000..583334a --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java @@ -0,0 +1,40 @@ +package org.nl.wms.sch.report.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.pdm.service.dao.PdmBdWorkorder; +import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; +import org.nl.wms.sch.material.service.dao.Material; +import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper; +import org.nl.wms.sch.report.service.IReportService; +import org.nl.wms.sch.report.service.dao.mapper.ReportMapper; +import org.nl.wms.sch.report.service.dto.ReportDto; +import org.nl.wms.sch.report.service.dto.ReportQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.nl.common.utils.PageUtil; + +import java.util.List; + +@Slf4j +@Service +public class ReportServiceImpl extends ServiceImpl implements IReportService { + + @Autowired + private ReportMapper reportMapper; + + @Override + public IPage queryAll(ReportQuery query, PageQuery pageQuery){ + IPage pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize()); + pages = reportMapper.queryReport(pages, query); + return pages; + + } + + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java index 9218f99..64f1639 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java @@ -243,16 +243,19 @@ public class YCLCKTask extends AbstractTask { head.setSRC_MSGID(IdUtil.simpleUUID()); head.setSRC_SYSTEM("AGV"); qpmes065Request.setHEAD(head); + QPMES065RequestBody qpmes065RequestBody=new QPMES065RequestBody(); + double qty=0; for(Material material:materialList) { - QPMES065RequestBody qpmes065RequestBody=new QPMES065RequestBody(); + qpmes065RequestBody.setMoname(extGroupData.getString("workorder_code")); qpmes065RequestBody.setLotSN(material.getPalletSN()); - qpmes065RequestBody.setQty(String.valueOf(one.getMaterial_qty())); + qty+=Double.parseDouble(material.getQty()); qpmes065RequestBody.setSiteName(material.getLocationCode()); qpmes065RequestBody.setZXXV01(extGroupData.getString("workorder_code")!=null?"1":"0"); qpmes065RequestBody.setZXXV02(taskObj.getVehicle_code()); - qpmes065RequestBodyList.add(qpmes065RequestBody); } + qpmes065RequestBody.setQty(String.valueOf(qty)); + qpmes065RequestBodyList.add(qpmes065RequestBody); qpmes065Request.setBODY(qpmes065RequestBodyList); log.info("开始调用QPMES065服务，入参{}",JSON.toJSONString(qpmes065Request)); String resultMsg = HttpRequest.post(url) diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue index a0e1a28..08ed6a8 100644 --- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue @@ -266,6 +266,8 @@ +