From aea07382d52a489aa358579f715b8decc58f3145 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Fri, 26 Sep 2025 16:53:08 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E7=8E=B0=E5=9C=BA=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/controller/PdaTaskController.java | 6 +++ .../wms/pda/task/service/PdaTaskService.java | 2 + .../task/service/impl/PdaTaskServiceImpl.java | 41 +++++++++++++++++++ .../controller/MaterialRecordController.java | 6 +++ .../service/MaterialRecordService.java | 4 ++ .../dao/mapper/MaterialRecordMapper.java | 2 + .../dao/mapper/MaterialRecordMapper.xml | 8 ++++ .../impl/MaterialRecordServiceImpl.java | 11 +++++ nladmin-ui/public/config.js | 4 +- .../wms/basedata/material/MaterialDialog.vue | 23 ++++++++--- .../wms/sch/materialRecord/materialRecord.js | 9 +++- 11 files changed, 107 insertions(+), 9 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/controller/PdaTaskController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/controller/PdaTaskController.java index e4ecdff..6024908 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/controller/PdaTaskController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/controller/PdaTaskController.java @@ -96,6 +96,12 @@ public class PdaTaskController { return new ResponseEntity<>(pdaTaskService.getMaterialInfoByPoint(whereJson), HttpStatus.OK); } + @PostMapping("/selectMaterialByPointCode") + @Log("根据点位获取组盘信息") + public ResponseEntity selectMaterialByPointCode(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaTaskService.selectMaterialByPointCode(whereJson), HttpStatus.OK); + } + @PostMapping("/loading") @Log("产线上料") diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java index b698572..3cbf5ce 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java @@ -66,4 +66,6 @@ public interface PdaTaskService { JSONObject getChargeRegions(); JSONObject getMaterialTypes(); + + JSONObject selectMaterialByPointCode(JSONObject whereJson); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java index b38b59a..ccce659 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java @@ -483,6 +483,47 @@ public class PdaTaskServiceImpl implements PdaTaskService { return ret; } + @Override + public JSONObject selectMaterialByPointCode(JSONObject whereJson) { + String point_code = whereJson.getString("point_code"); + if (ObjectUtil.isEmpty(point_code)) { + throw new BadRequestException("点位不能为空！"); + } + SchBasePoint point = pointMapper.selectOne(new LambdaQueryWrapper().eq(SchBasePoint::getPoint_code, point_code)); + if (ObjectUtil.isEmpty(point)) { + throw new BadRequestException("点位不存在！"); + } + String storagevehicle_code = point.getStoragevehicle_code(); + List list = new ArrayList<>(); + JSONArray arr = new JSONArray(); + if (ObjectUtil.isNotEmpty(storagevehicle_code)) { + GroupPlate groupPlate = groupplateMapper.selectOne(new LambdaQueryWrapper() + .eq(GroupPlate::getStoragevehicle_code, storagevehicle_code) + .eq(GroupPlate::getStatus, GroupStatus.START.getCode()) + .eq(GroupPlate::getIs_delete, GeneralDefinition.NO)); + if (ObjectUtil.isNotEmpty(groupPlate)) { + String group_id = groupPlate.getGroup_id(); + list = groupplatedtlService.getGroupPlatedtlList(group_id); + if (ObjectUtil.isNotEmpty(list)) { + list.forEach(groupPlatedtl -> { + JSONObject jo = new JSONObject(); + jo.put("container_code", groupPlatedtl.getContainer_code()); + jo.put("material_code", groupPlatedtl.getMaterial_code()); + jo.put("material_name", groupPlatedtl.getMaterial_name()); + jo.put("qty", groupPlatedtl.getQty()); + jo.put("measure_unit_id", groupPlatedtl.getUnit_name()); + arr.add(jo); + }); + } + } + } + JSONObject ret = new JSONObject(); + ret.put("code", String.valueOf(HttpStatus.HTTP_OK)); + ret.put("message", "查询成功"); + ret.put("data", arr); + return ret; + } + @Override public JSONObject getMaterialInfoByPoint(JSONObject whereJson) { String point_code = whereJson.getString("point_code"); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/controller/MaterialRecordController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/controller/MaterialRecordController.java index d0e3067..941d411 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/controller/MaterialRecordController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/controller/MaterialRecordController.java @@ -50,6 +50,12 @@ public class MaterialRecordController { return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/getMaterialTypes") + @Log("查询物料类型") + public ResponseEntity getMaterialTypes(){ + return new ResponseEntity<>(materialRecordService.getMaterialTypes(),HttpStatus.OK); + } + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/MaterialRecordService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/MaterialRecordService.java index b1e4665..8ac2c09 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/MaterialRecordService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/MaterialRecordService.java @@ -1,5 +1,6 @@ package org.nl.wms.sch.material.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; @@ -8,6 +9,7 @@ import org.nl.wms.sch.material.service.dto.MaterialRecordQuery; import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; import org.nl.wms.sch.task.service.dto.SchBaseTaskconfigQuery; +import java.util.List; import java.util.Set; public interface MaterialRecordService extends IService { @@ -37,4 +39,6 @@ public interface MaterialRecordService extends IService { * @param ids / */ void deleteAll(Set ids); + + List getMaterialTypes(); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/mapper/MaterialRecordMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/mapper/MaterialRecordMapper.java index b9e8024..a825409 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/mapper/MaterialRecordMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/mapper/MaterialRecordMapper.java @@ -13,4 +13,6 @@ public interface MaterialRecordMapper extends BaseMapper { IPage selectPageLeftJoin(IPage pages, MaterialRecordQuery whereJson); List selectMaterialByRegion(@Param("region_code") String region_code); + + List getMaterialTypes(); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/mapper/MaterialRecordMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/mapper/MaterialRecordMapper.xml index b85525e..9e2cd56 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/mapper/MaterialRecordMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/mapper/MaterialRecordMapper.xml @@ -28,4 +28,12 @@ region_code = #{region_code} AND DATE ( create_time ) >= CURDATE() + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialRecordServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialRecordServiceImpl.java index d86658d..0717efc 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialRecordServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialRecordServiceImpl.java @@ -2,6 +2,9 @@ package org.nl.wms.sch.material.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.http.HttpStatus; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -24,6 +27,8 @@ import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; import java.util.Set; @Service @@ -85,4 +90,10 @@ public class MaterialRecordServiceImpl extends ServiceImpl getMaterialTypes() { + List list = materialRecordMapper.getMaterialTypes(); + return list; + } } diff --git a/nladmin-ui/public/config.js b/nladmin-ui/public/config.js index a96030b..3b399da 100644 --- a/nladmin-ui/public/config.js +++ b/nladmin-ui/public/config.js @@ -1,9 +1,9 @@ window.g = { dev: { - VUE_APP_BASE_API: 'http://192.168.217.8:8010' + VUE_APP_BASE_API: 'http://192.168.217.2:8010' }, prod: { - VUE_APP_BASE_API: 'http://192.168.217.8:8010' + VUE_APP_BASE_API: 'http://192.168.217.2:8010' } } diff --git a/nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue b/nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue index e73b052..0a906b2 100644 --- a/nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue +++ b/nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue @@ -24,14 +24,21 @@ @keyup.enter.native="crud.toQuery" /> - - + + class="filter-item" + @change="hand" + > + + @@ -81,6 +88,7 @@ import CRUD, { header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import pagination from '@crud/Pagination' import '@riophae/vue-treeselect/dist/vue-treeselect.css' +import materialRecord from '@/views/wms/sch/materialRecord/materialRecord' export default { name: 'MaterialDialog', @@ -104,7 +112,8 @@ export default { return { dialogVisible: false, tableRadio: null, - tableData: [] + tableData: [], + materialTypesList: [] } }, watch: { @@ -119,7 +128,9 @@ export default { this.tableRadio = item }, open() { - + materialRecord.getMaterialTypes().then(res => { + this.materialTypesList = res + }) }, handleSelectionChange(val, row) { if (val.length > 1) { diff --git a/nladmin-ui/src/views/wms/sch/materialRecord/materialRecord.js b/nladmin-ui/src/views/wms/sch/materialRecord/materialRecord.js index 6737d7a..6fb69a7 100644 --- a/nladmin-ui/src/views/wms/sch/materialRecord/materialRecord.js +++ b/nladmin-ui/src/views/wms/sch/materialRecord/materialRecord.js @@ -24,4 +24,11 @@ export function edit(data) { }) } -export default { add, edit, del } +export function getMaterialTypes() { + return request({ + url: 'api/materialRecord/getMaterialTypes', + method: 'post' + }) +} + +export default { add, edit, del, getMaterialTypes}