diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml index d18a4dd..f14a246 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml @@ -141,7 +141,9 @@ WHEN '2' THEN '合格' WHEN '3' THEN '不合格' END - ) AS quality_name + ) AS quality_name, + late.material_type, + late.execution_stand FROM md_pb_storagevehicleext ext INNER JOIN st_ivt_structattr attr ON ext.storagevehicle_code = attr.storagevehicle_code diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaInGroupBoxController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaInGroupBoxController.java index 5927843..20680dd 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaInGroupBoxController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaInGroupBoxController.java @@ -60,4 +60,11 @@ public class PdaInGroupBoxController { return new ResponseEntity<>(pdaInGroupBoxService.queryDevice(), HttpStatus.OK); } + @PostMapping("/queryExecution") + @Log("入库组盘查执行标准下拉框") + @SaIgnore + public ResponseEntity queryExecution() { + return new ResponseEntity<>(pdaInGroupBoxService.queryExecution(), HttpStatus.OK); + } + } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaInGroupBoxService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaInGroupBoxService.java index c93015c..be5f04f 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaInGroupBoxService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaInGroupBoxService.java @@ -59,4 +59,10 @@ public interface PdaInGroupBoxService { * @return PdaResponse */ PdaResponse queryDevice(); + + /** + * 入库组盘查执行标准下拉框 + * @return PdaResponse + */ + PdaResponse queryExecution(); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaInGroupBoxServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaInGroupBoxServiceImpl.java index db6ea96..2782bdc 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaInGroupBoxServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaInGroupBoxServiceImpl.java @@ -11,6 +11,7 @@ import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService; import org.nl.wms.basedata_manage.service.dao.EmBiDeviceinfo; import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase; import org.nl.wms.pda.general_management.service.PdaInGroupBoxService; +import org.nl.wms.pda.util.PDAEnum; import org.nl.wms.pda.util.PdaResponse; import org.nl.wms.pdm_manage.service.IPdmBomCallMaterialService; import org.nl.wms.pdm_manage.service.dao.PdmBomCallMaterial; @@ -158,4 +159,9 @@ public class PdaInGroupBoxServiceImpl implements PdaInGroupBoxService { }); return PdaResponse.requestParamOk(resultList); } + + @Override + public PdaResponse queryExecution() { + return PdaResponse.requestParamOk(PDAEnum.EXECUTION_STAND.getDict()); + } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java index c88caed..9fffa3b 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java @@ -37,6 +37,13 @@ public enum PDAEnum { // 运送类型 TASK_TYPE(MapOf.of("小料箱", "1", "大料箱或其他", "2")), + // 组盘物料执行标准 + EXECUTION_STAND(MapOf.of("AWS A5.18", "AWS A5.18", "AWS A5.9M", "AWS A5.9M", + "GB/T 15620","GB/T 15620", "GB/T 17853","GB/T 17853", + "GB/T 8110","GB/T 8110", "GNB/T 47018","NB/T 47018" + + )), + ; private Map code; diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java index f7cb906..ce29e44 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java @@ -149,6 +149,11 @@ public class GroupPlate implements Serializable { */ private String is_return; + /** + * 物料类型: 0 - 压容 1 - 非压容 + */ + private String material_type; + /** * 工单集合 */ diff --git a/wms/nladmin-ui/src/i18n/langs/zh-CN.js b/wms/nladmin-ui/src/i18n/langs/zh-CN.js index fa4fbfc..7fdb6b9 100644 --- a/wms/nladmin-ui/src/i18n/langs/zh-CN.js +++ b/wms/nladmin-ui/src/i18n/langs/zh-CN.js @@ -2,7 +2,7 @@ export default { 'lang': 'zh', // 平台 'platform': { - 'title': '徐工汉云WMS系统', + 'title': '哈电镇江焊材库wms系统', 'tip1': '用户名不能为空', 'tip2': '密码不能为空', 'tip3': '验证码不能为空' diff --git a/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue index af1f39f..504e4b7 100644 --- a/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue +++ b/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue @@ -26,7 +26,7 @@ export default { }, data() { return { - title: '徐工汉云WMS系统', + title: '哈电镇江焊材库wms系统', logo: '', title_param: 'platform' } diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue index fd6ff5f..7788688 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue @@ -340,6 +340,7 @@ + @@ -511,6 +512,13 @@ export default { formattStatus(row) { return this.dict.label.GROUP_STATUS[row.status] }, + formattMaterial(row) { + if (row.material_type === '0') { + return '压容' + } else if (row.material_type === '1') { + return '非压容' + } + }, formattBoxType(row) { return this.dict.label.storagevehicle_type[row.box_type] }, diff --git a/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue b/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue index ef6cc1c..67b026b 100644 --- a/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue +++ b/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue @@ -110,6 +110,8 @@ + + @@ -200,6 +202,13 @@ export default { isReturn(row, column) { return this.dict.label.IS_OR_NOT[row.is_return] }, + formattMaterial(row) { + if (row.material_type === '0') { + return '压容' + } else if (row.material_type === '1') { + return '非压容' + } + }, downdtl() { if (this.currentRow !== null) { this.showDtlLoading = true