root/XuGongHanYunWMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev: 修改

Browse Source
This commit is contained in:
liuxy
2026-03-13 15:01:22 +08:00
parent 1ddf83478d
commit 50b357b6f9
5 changed files with 130 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wms/nladmin-system/nlsso-server/src/main/java/org/nl/config/excel/group/GroupExcelDTO.java
View File

@@ -40,4 +40,10 @@ public class GroupExcelDTO {
@ExcelProperty("机台编码") @ExcelProperty("机台编码")
private String device_code; private String device_code;
@ExcelProperty("执行标准")
private String execution_stand;
@ExcelProperty("是否压容")
private String material_type;
} }

4
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/screen/service/impl/ScreenServiceImpl.java
View File

@@ -77,8 +77,8 @@ public class ScreenServiceImpl implements IScreenService {
String today = DateUtil.today(); String today = DateUtil.today();
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
// params.put("startDate", today); params.put("startDate", today);
// params.put("endDate", today); params.put("endDate", today);
// 班组焊材消耗报表 // 班组焊材消耗报表
List<Map<String, Object>> consumeList = screenMapper.getConsumeReport(params); List<Map<String, Object>> consumeList = screenMapper.getConsumeReport(params);

140
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToAcsServiceImpl.java
View File

@@ -47,80 +47,80 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
//"temp": 25.6, 温度 //"temp": 25.6, 温度
// "hum": 60.2 适度 // "hum": 60.2 适度
object.put("temp","25.6"); // object.put("temp","25.6");
object.put("hum","60.2"); // object.put("hum","60.2");
return AcsResponse.requestOk(object); // return AcsResponse.requestOk(object);
// JSONObject whereJson = object; JSONObject whereJson = object;
// whereJson.put("device_code","WSD1"); whereJson.put("device_code","WSD1");
// return AcsUtil.notifyAcs(EXTConstant.GET_TEMPHUM_ACS_API, whereJson); return AcsUtil.notifyAcs(EXTConstant.GET_TEMPHUM_ACS_API, whereJson);
} }
@Override @Override
public AcsResponse getAgvStatus() { public AcsResponse getAgvStatus() {
Map<String, Object> agvStatusMap = new HashMap<>(); // Map<String, Object> agvStatusMap = new HashMap<>();
agvStatusMap.put("1",AgvStatus.builder() // agvStatusMap.put("1",AgvStatus.builder()
.status("1") // .status("1")
.carId("2") // .carId("2")
.icon("潜伏式AGV.png") // .icon("潜伏式AGV.png")
.carType("潜伏式AGV").power("66").taskCode("123123").build()); // .carType("潜伏式AGV").power("66").taskCode("123123").build());
agvStatusMap.put("1",AgvStatus.builder() // agvStatusMap.put("1",AgvStatus.builder()
.status("1") // .status("1")
.carId("1") // .carId("1")
.carType("CTU料箱AGV") // .carType("CTU料箱AGV")
.icon("料箱式AGV.png") // .icon("料箱式AGV.png")
.power("77") // .power("77")
.taskCode("33322") // .taskCode("33322")
.build()); // .build());
agvStatusMap.put("2",AgvStatus.builder() // agvStatusMap.put("2",AgvStatus.builder()
.status("1") // .status("1")
.carId("2") // .carId("2")
.carType("CTU料箱AGV") // .carType("CTU料箱AGV")
.icon("料箱式AGV.png") // .icon("料箱式AGV.png")
.power("77") // .power("77")
.taskCode("33322") // .taskCode("33322")
.build()); // .build());
agvStatusMap.put("3",AgvStatus.builder() // agvStatusMap.put("3",AgvStatus.builder()
.status("1") // .status("1")
.carId("3") // .carId("3")
.carType("CTU料箱AGV") // .carType("CTU料箱AGV")
.icon("料箱式AGV.png") // .icon("料箱式AGV.png")
.power("77") // .power("77")
.taskCode("33322") // .taskCode("33322")
.build()); // .build());
agvStatusMap.put("5",AgvStatus.builder() // agvStatusMap.put("5",AgvStatus.builder()
.status("1") // .status("1")
.carId("5") // .carId("5")
.carType("CTU料箱AGV") // .carType("CTU料箱AGV")
.icon("料箱式AGV.png") // .icon("料箱式AGV.png")
.power("77") // .power("77")
.taskCode("33322") // .taskCode("33322")
.build()); // .build());
agvStatusMap.put("4",AgvStatus.builder() // agvStatusMap.put("4",AgvStatus.builder()
.status("1") // .status("1")
.carId("4") // .carId("4")
.carType("CTU料箱AGV") // .carType("CTU料箱AGV")
.icon("料箱式AGV.png") // .icon("料箱式AGV.png")
.power("77") // .power("77")
.taskCode("33322") // .taskCode("33322")
.build()); // .build());
agvStatusMap.put("6",AgvStatus.builder() // agvStatusMap.put("6",AgvStatus.builder()
.status("1") // .status("1")
.carId("6") // .carId("6")
.carType("CTU料箱AGV") // .carType("CTU料箱AGV")
.icon("料箱式AGV.png") // .icon("料箱式AGV.png")
.power("77") // .power("77")
.taskCode("33322") // .taskCode("33322")
.build()); // .build());
agvStatusMap.put("7",AgvStatus.builder() // agvStatusMap.put("7",AgvStatus.builder()
.status("1") // .status("1")
.carId("7") // .carId("7")
.carType("CTU料箱AGV") // .carType("CTU料箱AGV")
.icon("料箱式AGV.png") // .icon("料箱式AGV.png")
.power("77") // .power("77")
.taskCode("33322") // .taskCode("33322")
.build()); // .build());
return AcsResponse.requestOk(new JSONObject(agvStatusMap)); // return AcsResponse.requestOk(new JSONObject(agvStatusMap));
// return AcsUtil.notifyAcs(EXTConstant.GET_AGVSTATUS_ACS_API,new JSONObject()); return AcsUtil.notifyAcs(EXTConstant.GET_AGVSTATUS_ACS_API,new JSONObject());
} }
} }

3
wms/nladmin-system/nlsso-server/src/main/resources/developLog/0309.sql
View File

@@ -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 ('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'); 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;

51
wms/nladmin-ui/src/views/wms/basedata/group/index.vue
View File

@@ -272,12 +272,44 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="执行标准" prop="execution_stand"> <el-form-item label="执行标准" prop="execution_stand">
<el-input v-model="form.execution_stand" style="width: 380px;" rows="2" type="textarea" /> <el-select
v-model="form.execution_stand"
size="mini"
style="width: 200px;"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in executionList"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="是否压容" prop="material_type">
<el-select
v-model="form.material_type"
size="mini"
style="width: 200px;"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in materialType"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label> <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
@@ -441,6 +473,18 @@ export default {
deviceList: [], deviceList: [],
materList: [], materList: [],
pcsnList: [], 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: { formPrint: {
print_num: 1 print_num: 1
}, },
@@ -460,6 +504,9 @@ export default {
produce_time: [ produce_time: [
{ required: true, message: '生产日期不能为空', trigger: 'blur' } { required: true, message: '生产日期不能为空', trigger: 'blur' }
], ],
execution_stand: [
{ required: true, message: '执行标准不能为空', trigger: 'blur' }
],
box_type: [ box_type: [
{ required: true, message: '料箱类型不能为空', trigger: 'blur' } { required: true, message: '料箱类型不能为空', trigger: 'blur' }
] ]