From 55bc3b18c0134df1a4993b58c4c9b535dbc26b21 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Wed, 29 Jul 2026 16:53:23 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dao/MdMeMaterialbase.java | 5 +++ .../impl/MdMeMaterialbaseServiceImpl.java | 12 +++++-- .../controller/PdaIosOutController.java | 6 +++- .../service/impl/PdaIosInServiceImpl.java | 32 +++++++++---------- .../service/impl/PdaJBServiceImpl.java | 3 +- .../dao/mapper/MdPbGroupplateMapper.xml | 3 +- .../src/views/wms/basedata/material/index.vue | 7 ++++ 7 files changed, 46 insertions(+), 22 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java index 01783b4..ffbc45c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java @@ -52,6 +52,11 @@ public class MdMeMaterialbase implements Serializable { */ private String material_model; + /** + * 总型号（用于来料入库库区匹配） + */ + private String material_general_model; + /** * 外文名称 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java index 89827e6..4be478c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java @@ -194,15 +194,16 @@ public class MdMeMaterialbaseServiceImpl extends ServiceImpl>> 下载导入模板失败：", e); } } + + private String getCellString(Row row, int cellIndex) { + Cell cell = row.getCell(cellIndex); + return cell == null ? null : cell.toString(); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosOutController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosOutController.java index 2aa82b0..12424e3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosOutController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosOutController.java @@ -177,7 +177,11 @@ public class PdaIosOutController { if (byCode == null) { throw new BadRequestException("更新失败:未配置apk下载地址"); } - Map of = MapOf.of("versionName", "1.0.1", "url", "http://" + byCode.getValue() + "/api/pda/iosOut/download/app-release"); + Param appVersion = iSysParamService.findByCode("appVersion"); + if (appVersion == null) { + throw new BadRequestException("更新失败:未配置APP版本"); + } + Map of = MapOf.of("versionName", appVersion.getValue(), "url", "http://" + byCode.getValue() + "/api/pda/iosOut/download/app-release"); return new ResponseEntity<>(of, HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java index d49d8ec..ac6beee 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -971,15 +971,15 @@ public class PdaIosInServiceImpl implements PdaIosInService { //起点 whereJson.put("site_code", paramDto.getSite_code()); whereJson.put("noEmptyVehicle", "1"); - String material_model = getVehicleMaterial(whereJson).getString("material_model"); - if (StringUtils.isBlank(material_model)) { - throw new BadRequestException("组盘的物料未配置【物料型号】！"); + String material_general_model = getVehicleMaterial(whereJson).getString("material_general_model"); + if (StringUtils.isBlank(material_general_model)) { + throw new BadRequestException("组盘的物料未配置【总型号】！"); } - //判断每个物料是否都已经配置库区 - List dicts = dictList.stream().filter(a -> material_model.equals(a.getPara1())).collect(Collectors.toList()); + // 根据总型号匹配目标库区 + List dicts = dictList.stream().filter(a -> material_general_model.equals(a.getPara1())).collect(Collectors.toList()); if (CollectionUtils.isEmpty(dicts)) { - throw new BadRequestException("字典MATERIAL_MODEL_SECT未配置物料类型" + material_model + "与库区的对应关系，请核对！"); + throw new BadRequestException("字典MATERIAL_MODEL_SECT未配置总型号" + material_general_model + "与库区的对应关系，请核对！"); } String sect_code = dicts.get(0).getValue(); @@ -1486,9 +1486,9 @@ public class PdaIosInServiceImpl implements PdaIosInService { //起点 whereJson.put("site_code", site_code); whereJson.put("noEmptyVehicle", "1"); - String material_model = getVehicleMaterial(whereJson).getString("material_model"); - if (StringUtils.isBlank(material_model)) { - throw new BadRequestException("组盘的物料未配置【物料型号】！"); + String material_general_model = getVehicleMaterial(whereJson).getString("material_general_model"); + if (StringUtils.isBlank(material_general_model)) { + throw new BadRequestException("组盘的物料未配置【总型号】！"); } //判断每个物料是否都已经配置库区 @@ -1496,9 +1496,9 @@ public class PdaIosInServiceImpl implements PdaIosInService { List dictList = sysDictMapper.selectList(new LambdaQueryWrapper() .eq(Dict::getCode, "MATERIAL_MODEL_SECT")); - List dicts = dictList.stream().filter(a -> material_model.equals(a.getPara1())).collect(Collectors.toList()); + List dicts = dictList.stream().filter(a -> material_general_model.equals(a.getPara1())).collect(Collectors.toList()); if (CollectionUtils.isEmpty(dicts)) { - throw new BadRequestException("字典MATERIAL_MODEL_SECT未配置物料类型" + material_model + "与库区的对应关系，请核对！"); + throw new BadRequestException("字典MATERIAL_MODEL_SECT未配置总型号" + material_general_model + "与库区的对应关系，请核对！"); } String sect_code = dicts.get(0).getValue(); @@ -1597,10 +1597,10 @@ public class PdaIosInServiceImpl implements PdaIosInService { whereJson.put("site_code", schBasePoint.getPoint_code()); whereJson.put("noEmptyVehicle", "1"); - String material_model = ""; + String material_general_model = ""; try { - material_model = getVehicleMaterial(whereJson).getString("material_model"); - if (StringUtils.isBlank(material_model)) { + material_general_model = getVehicleMaterial(whereJson).getString("material_general_model"); + if (StringUtils.isBlank(material_general_model)) { continue; } } catch (Exception e){ @@ -1608,14 +1608,14 @@ public class PdaIosInServiceImpl implements PdaIosInService { continue; } - final String final_material_model = material_model; + final String final_material_general_model = material_general_model; //判断每个物料是否都已经配置库区 //查询字典表 List dictList = sysDictMapper.selectList(new LambdaQueryWrapper() .eq(Dict::getCode, "MATERIAL_MODEL_SECT")); - List dicts = dictList.stream().filter(a -> final_material_model.equals(a.getPara1())).collect(Collectors.toList()); + List dicts = dictList.stream().filter(a -> final_material_general_model.equals(a.getPara1())).collect(Collectors.toList()); if (CollectionUtils.isEmpty(dicts)) { continue; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java index 76070fa..f59661d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java @@ -124,9 +124,10 @@ public class PdaJBServiceImpl implements PdaJBService { @Override public PdaResponse getOrderList(JSONObject whereJson) { + String flag = whereJson.getString("flag"); List workorders = pdaJBMapper.getUnProductOrderList( whereJson.getString("point_code"), - "1,2"); + "1".equals(flag) ? "1,2" : "4"); return PdaResponse.requestParamOk(workorders); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.xml index 94c88a3..3d189bc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.xml @@ -59,7 +59,8 @@ mater.material_id, mater.material_code, mater.material_name, - mater.material_model + mater.material_model, + mater.material_general_model FROM md_pb_groupplate gro LEFT JOIN md_me_materialbase mater ON mater.material_id = gro.material_id diff --git a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue index fe1dff4..9883248 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue @@ -67,6 +67,11 @@ + + + + + @@ -105,6 +110,7 @@ + @@ -159,6 +165,7 @@ const defaultForm = { material_name: null, material_spec: null, material_model: null, + material_general_model: null, english_name: null, base_unit_id: null, approve_fileno: null,