From a0ad123c261168582fa9227b3e4f7731f98cb463 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sat, 6 Jan 2024 09:45:17 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E6=BB=9A=E7=AD=92=E7=BA=BF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/pda/service/impl/PdaServiceImpl.java | 10 +++++++--- .../report/controller/ReportController.java | 3 ++- .../service/dao/mapper/ReportMapper.java | 2 +- .../service/dao/mapper/ReportMapper.xml | 4 ++++ .../service/impl/ReportServiceImpl.java | 4 +++- lms/nladmin-ui/src/views/login.vue | 4 ++-- .../views/wms/das/insideDrumLine/index.vue | 20 +++++++++++++++++++ 7 files changed, 39 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java index 4df7636..1ac6f66 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java @@ -429,8 +429,12 @@ public class PdaServiceImpl implements PdaService { if (ObjectUtil.isEmpty(material)) { throw new BadRequestException("物料信息不存在"); } - SchBaseVehiclematerialgroup group = new SchBaseVehiclematerialgroup(); - group.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + SchBaseVehiclematerialgroup group = vehiclematerialgroupService.getGroupInfo(shelfSaveDto.getVehicle_code(), + GeneralDefinition.STEEL_TRAY, GroupBindMaterialStatusEnum.BOUND.getValue()); + if (ObjectUtil.isEmpty(group)) { + group = new SchBaseVehiclematerialgroup(); + group.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + } group.setMaterial_qty(Integer.valueOf(shelfSaveDto.getMaterial_qty())); group.setMaterial_id(shelfSaveDto.getMaterial_id()); group.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue()); @@ -447,6 +451,6 @@ public class PdaServiceImpl implements PdaService { group.setCreate_id(SecurityUtils.getCurrentUserId()); group.setCreate_name(SecurityUtils.getCurrentNickName()); group.setCreate_time(DateUtil.now()); - vehiclematerialgroupService.save(group); + vehiclematerialgroupService.saveOrUpdate(group); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java index 2e18bf6..c464e08 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java @@ -11,6 +11,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.Map; @@ -72,7 +73,7 @@ public class ReportController { @GetMapping("/insideDrumLineReport") @Log("滚筒线内物料实时报表") - public ResponseEntity insideDrumLineReport(Map json, PageQuery page) { + public ResponseEntity insideDrumLineReport(@RequestParam Map json, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(reportService.insideDrumLineReport(json, page)), HttpStatus.OK); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java index acc9398..3c7d429 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java @@ -20,5 +20,5 @@ public interface ReportMapper { IPage inventoryMaterialTimeoutWarning(IPage pages, JSONObject object); - IPage insideDrumLineReport(IPage pages, JSONObject object); + IPage insideDrumLineReport(IPage pages, String blurry); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml index 1c04d05..4516915 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml @@ -68,5 +68,9 @@ LEFT JOIN md_base_material m ON m.material_id = vg.material_id WHERE vg.point_code IN ('HCSSX01', 'HCSSX63') AND vg.group_bind_material_status = '2' + + AND m.material_code LIKE '%${blurry}%' + + ORDER BY vg.update_time DESC diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java index 0d98a81..7609a8f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java @@ -1,5 +1,6 @@ package org.nl.wms.report.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -56,8 +57,9 @@ public class ReportServiceImpl implements ReportService { @Override public IPage insideDrumLineReport(Map query, PageQuery page) { + String blurry = ObjectUtil.isNotEmpty(query.get("blurry")) ? query.get("blurry").toString() : null; IPage pages = new Page<>(page.getPage() + 1, page.getSize()); - pages = reportMapper.insideDrumLineReport(pages, new JSONObject(query)); + pages = reportMapper.insideDrumLineReport(pages, blurry); return pages; } } diff --git a/lms/nladmin-ui/src/views/login.vue b/lms/nladmin-ui/src/views/login.vue index 79835c5..844eaf9 100644 --- a/lms/nladmin-ui/src/views/login.vue +++ b/lms/nladmin-ui/src/views/login.vue @@ -56,8 +56,8 @@ export default { codeUrl: '', cookiePass: '', loginForm: { - username: 'admin', - password: '123456', + username: '', + password: '', rememberMe: false, code: '', uuid: '' diff --git a/lms/nladmin-ui/src/views/wms/das/insideDrumLine/index.vue b/lms/nladmin-ui/src/views/wms/das/insideDrumLine/index.vue index c78cb95..a6f2bb9 100644 --- a/lms/nladmin-ui/src/views/wms/das/insideDrumLine/index.vue +++ b/lms/nladmin-ui/src/views/wms/das/insideDrumLine/index.vue @@ -2,6 +2,26 @@
+
+ + + + + + +