diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/config/excel/group/GroupExcelDTO.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/config/excel/group/GroupExcelDTO.java index 3e43d88..68eeac8 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/config/excel/group/GroupExcelDTO.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/config/excel/group/GroupExcelDTO.java @@ -40,4 +40,10 @@ public class GroupExcelDTO { @ExcelProperty("机台编码") private String device_code; + + @ExcelProperty("执行标准") + private String execution_stand; + + @ExcelProperty("是否压容") + private String material_type; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/screen/service/impl/ScreenServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/screen/service/impl/ScreenServiceImpl.java index bd8db62..dfc14a0 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/screen/service/impl/ScreenServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/screen/service/impl/ScreenServiceImpl.java @@ -77,8 +77,8 @@ public class ScreenServiceImpl implements IScreenService { String today = DateUtil.today(); Map params = new HashMap<>(); -// params.put("startDate", today); -// params.put("endDate", today); + params.put("startDate", today); + params.put("endDate", today); // 班组焊材消耗报表 List> consumeList = screenMapper.getConsumeReport(params); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToAcsServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToAcsServiceImpl.java index 5949378..21d74b2 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToAcsServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToAcsServiceImpl.java @@ -47,80 +47,80 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { JSONObject object = new JSONObject(); //"temp": 25.6, 温度 // "hum": 60.2 适度 - object.put("temp","25.6"); - object.put("hum","60.2"); - return AcsResponse.requestOk(object); -// JSONObject whereJson = object; -// whereJson.put("device_code","WSD1"); -// return AcsUtil.notifyAcs(EXTConstant.GET_TEMPHUM_ACS_API, whereJson); +// object.put("temp","25.6"); +// object.put("hum","60.2"); +// return AcsResponse.requestOk(object); + JSONObject whereJson = object; + whereJson.put("device_code","WSD1"); + return AcsUtil.notifyAcs(EXTConstant.GET_TEMPHUM_ACS_API, whereJson); } @Override public AcsResponse getAgvStatus() { - Map agvStatusMap = new HashMap<>(); - agvStatusMap.put("1",AgvStatus.builder() - .status("1") - .carId("2") - .icon("潜伏式AGV.png") - .carType("潜伏式AGV").power("66").taskCode("123123").build()); - agvStatusMap.put("1",AgvStatus.builder() - .status("1") - .carId("1") - .carType("CTU料箱AGV") - .icon("料箱式AGV.png") - .power("77") - .taskCode("33322") - .build()); - agvStatusMap.put("2",AgvStatus.builder() - .status("1") - .carId("2") - .carType("CTU料箱AGV") - .icon("料箱式AGV.png") - .power("77") - .taskCode("33322") - .build()); - agvStatusMap.put("3",AgvStatus.builder() - .status("1") - .carId("3") - .carType("CTU料箱AGV") - .icon("料箱式AGV.png") - .power("77") - .taskCode("33322") - .build()); - agvStatusMap.put("5",AgvStatus.builder() - .status("1") - .carId("5") - .carType("CTU料箱AGV") - .icon("料箱式AGV.png") - .power("77") - .taskCode("33322") - .build()); - agvStatusMap.put("4",AgvStatus.builder() - .status("1") - .carId("4") - .carType("CTU料箱AGV") - .icon("料箱式AGV.png") - .power("77") - .taskCode("33322") - .build()); - agvStatusMap.put("6",AgvStatus.builder() - .status("1") - .carId("6") - .carType("CTU料箱AGV") - .icon("料箱式AGV.png") - .power("77") - .taskCode("33322") - .build()); - agvStatusMap.put("7",AgvStatus.builder() - .status("1") - .carId("7") - .carType("CTU料箱AGV") - .icon("料箱式AGV.png") - .power("77") - .taskCode("33322") - .build()); - return AcsResponse.requestOk(new JSONObject(agvStatusMap)); -// return AcsUtil.notifyAcs(EXTConstant.GET_AGVSTATUS_ACS_API,new JSONObject()); +// Map agvStatusMap = new HashMap<>(); +// agvStatusMap.put("1",AgvStatus.builder() +// .status("1") +// .carId("2") +// .icon("潜伏式AGV.png") +// .carType("潜伏式AGV").power("66").taskCode("123123").build()); +// agvStatusMap.put("1",AgvStatus.builder() +// .status("1") +// .carId("1") +// .carType("CTU料箱AGV") +// .icon("料箱式AGV.png") +// .power("77") +// .taskCode("33322") +// .build()); +// agvStatusMap.put("2",AgvStatus.builder() +// .status("1") +// .carId("2") +// .carType("CTU料箱AGV") +// .icon("料箱式AGV.png") +// .power("77") +// .taskCode("33322") +// .build()); +// agvStatusMap.put("3",AgvStatus.builder() +// .status("1") +// .carId("3") +// .carType("CTU料箱AGV") +// .icon("料箱式AGV.png") +// .power("77") +// .taskCode("33322") +// .build()); +// agvStatusMap.put("5",AgvStatus.builder() +// .status("1") +// .carId("5") +// .carType("CTU料箱AGV") +// .icon("料箱式AGV.png") +// .power("77") +// .taskCode("33322") +// .build()); +// agvStatusMap.put("4",AgvStatus.builder() +// .status("1") +// .carId("4") +// .carType("CTU料箱AGV") +// .icon("料箱式AGV.png") +// .power("77") +// .taskCode("33322") +// .build()); +// agvStatusMap.put("6",AgvStatus.builder() +// .status("1") +// .carId("6") +// .carType("CTU料箱AGV") +// .icon("料箱式AGV.png") +// .power("77") +// .taskCode("33322") +// .build()); +// agvStatusMap.put("7",AgvStatus.builder() +// .status("1") +// .carId("7") +// .carType("CTU料箱AGV") +// .icon("料箱式AGV.png") +// .power("77") +// .taskCode("33322") +// .build()); +// return AcsResponse.requestOk(new JSONObject(agvStatusMap)); + return AcsUtil.notifyAcs(EXTConstant.GET_AGVSTATUS_ACS_API,new JSONObject()); } } diff --git a/wms/nladmin-system/nlsso-server/src/main/resources/developLog/0309.sql b/wms/nladmin-system/nlsso-server/src/main/resources/developLog/0309.sql index 3caf122..12025f8 100644 --- a/wms/nladmin-system/nlsso-server/src/main/resources/developLog/0309.sql +++ b/wms/nladmin-system/nlsso-server/src/main/resources/developLog/0309.sql @@ -16,3 +16,6 @@ INSERT INTO `sys_menu` (`menu_id`, `pid`, `sub_count`, `type`, `system_type`, `c -- 温湿度同步 INSERT INTO `sys_quartz_job` (`job_id`, `bean_name`, `cron_expression`, `is_pause`, `job_name`, `job_ip`, `method_name`, `params`, `description`, `person_in_charge`, `email`, `sub_task`, `pause_after_failure`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('2030967753933983744', 'autoSyncAgvStatus', '0/20 * * * * ?', b'1', 'agv状态同步', NULL, 'run', NULL, 'agv状态同步', '1', NULL, NULL, b'1', '1', '管理员', '2026-03-09 19:23:40', '1', '管理员', '2026-03-09 19:23:40'); INSERT INTO `sys_quartz_job` (`job_id`, `bean_name`, `cron_expression`, `is_pause`, `job_name`, `job_ip`, `method_name`, `params`, `description`, `person_in_charge`, `email`, `sub_task`, `pause_after_failure`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('2030966262800191488', 'autoSyncTemp', '* * 0/1 * * ?', b'1', '同步温湿度', NULL, 'run', NULL, '定时同步温湿度', 'admin', NULL, NULL, b'1', '1', '管理员', '2026-03-09 19:17:45', '1', '管理员', '2026-03-09 20:02:07'); + +-- 新增物料类型字段 +alter table md_pb_groupplate add COLUMN material_type VARCHAR(100) DEFAULT NULL; 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 7788688..3650963 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue @@ -272,12 +272,44 @@ - + - + + + + + + + + + + + + + @@ -441,6 +473,18 @@ export default { deviceList: [], materList: [], pcsnList: [], + executionList: [ + { 'label':'AWS A5.18', 'value': 'AWS A5.18' }, + { 'label':'AWS A5.9M', 'value': 'AWS A5.9M' }, + { 'label':'GB/T 15620', 'value': 'GB/T 15620' }, + { 'label':'GB/T 17853', 'value': 'GB/T 17853' }, + { 'label':'GB/T 8110', 'value': 'GB/T 8110' }, + { 'label':'NB/T 47018', 'value': 'NB/T 47018' } + ], + materialType: [ + { 'label':'压容', 'value': '0' }, + { 'label':'非压容', 'value': '1' } + ], formPrint: { print_num: 1 }, @@ -460,6 +504,9 @@ export default { produce_time: [ { required: true, message: '生产日期不能为空', trigger: 'blur' } ], + execution_stand: [ + { required: true, message: '执行标准不能为空', trigger: 'blur' } + ], box_type: [ { required: true, message: '料箱类型不能为空', trigger: 'blur' } ]