diff --git a/wms_pro/hd/.idea/encodings.xml b/wms_pro/hd/.idea/encodings.xml index 651ac7ba..09128f15 100644 --- a/wms_pro/hd/.idea/encodings.xml +++ b/wms_pro/hd/.idea/encodings.xml @@ -3,5 +3,7 @@ + + - + \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/TableDataInfo.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/TableDataInfo.java index 0be69ec5..a8578c8f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/TableDataInfo.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/TableDataInfo.java @@ -7,6 +7,7 @@ import lombok.Data; import java.util.Date; import lombok.NoArgsConstructor; +import org.nl.common.language.LangProcess; import java.io.Serializable; import java.util.List; @@ -62,7 +63,7 @@ public class TableDataInfo implements Serializable { public static TableDataInfo build(IPage page) { TableDataInfo rspData = new TableDataInfo<>(); rspData.setCode(String.valueOf(HttpStatus.HTTP_OK)); - rspData.setMsg("查询成功"); + rspData.setMsg(LangProcess.msg("common_ssucess")); rspData.setContent(page.getRecords()); rspData.setTotalElements(page.getTotal()); return rspData; @@ -71,7 +72,7 @@ public class TableDataInfo implements Serializable { public static TableDataInfo buildByDivForm(IPage page,String json_field) { TableDataInfo rspData = new TableDataInfo<>(); rspData.setCode(String.valueOf(HttpStatus.HTTP_OK)); - rspData.setMsg("查询成功"); + rspData.setMsg(LangProcess.msg("common_ssucess")); List records = page.getRecords(); records.forEach(a->{ Object o = a.get(json_field); @@ -92,24 +93,23 @@ public class TableDataInfo implements Serializable { public static TableDataInfo build(List list) { TableDataInfo rspData = new TableDataInfo<>(); rspData.setCode(String.valueOf(HttpStatus.HTTP_OK)); - rspData.setMsg("查询成功"); + rspData.setMsg(LangProcess.msg("common_ssucess")); rspData.setContent(list); rspData.setTotalElements(list.size()); return rspData; } - public static TableDataInfo build() { TableDataInfo rspData = new TableDataInfo<>(); rspData.setCode(String.valueOf(HttpStatus.HTTP_OK)); - rspData.setMsg("操作成功"); + rspData.setMsg(LangProcess.msg("common_ssucess")); return rspData; } public static TableDataInfo buildJson(Object result) { TableDataInfo rspData = new TableDataInfo<>(); rspData.setCode(String.valueOf(HttpStatus.HTTP_OK)); rspData.setData(result); - rspData.setMsg("操作成功"); + rspData.setMsg(LangProcess.msg("common_ssucess")); return rspData; } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/TableDataInfo.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/TableDataInfo.java index 27bb68a1..f4e44eee 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/TableDataInfo.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/TableDataInfo.java @@ -4,6 +4,7 @@ import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.Data; import lombok.NoArgsConstructor; +import org.nl.common.language.LangProcess; import java.io.Serializable; import java.util.List; @@ -53,7 +54,7 @@ public class TableDataInfo implements Serializable { public static TableDataInfo build(IPage page) { TableDataInfo rspData = new TableDataInfo<>(); rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("查询成功"); + rspData.setMsg(LangProcess.msg("common_ssucess")); rspData.setContent(page.getRecords()); rspData.setTotalElements(page.getTotal()); return rspData; @@ -62,7 +63,7 @@ public class TableDataInfo implements Serializable { public static TableDataInfo build(List list) { TableDataInfo rspData = new TableDataInfo<>(); rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("查询成功"); + rspData.setMsg(LangProcess.msg("common_ssucess")); rspData.setContent(list); rspData.setTotalElements(list.size()); return rspData; @@ -71,7 +72,7 @@ public class TableDataInfo implements Serializable { public static TableDataInfo build() { TableDataInfo rspData = new TableDataInfo<>(); rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("操作成功"); + rspData.setMsg(LangProcess.msg("common_ssucess")); return rspData; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java index ccb661de..8111d428 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java @@ -1,6 +1,7 @@ package org.nl.wms.dispatch_manage.task.controller; +import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; @@ -42,6 +43,7 @@ public class SchBaseTaskController { @PostMapping("getVehicleTask") @Log("查询载具任务") + @SaIgnore public ResponseEntity getVehicleTask(@RequestBody JSONObject param) { Assert.noNullElements(new Object[]{param,param.getString("vehicle_id")},"请求参数不能为空"); return new ResponseEntity<>(iSchBaseTaskService.getByVehicle(param.getString("vehicle_id")), HttpStatus.OK); @@ -78,6 +80,7 @@ public class SchBaseTaskController { @PutMapping("/operation") @Log("手动更新任务状态") + @SaIgnore public ResponseEntity update(@RequestBody JSONObject map) { iSchBaseTaskService.operation(map); return new ResponseEntity<>(HttpStatus.OK); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java index 1bc356bb..42e67eac 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java @@ -153,30 +153,27 @@ public class SchBaseTaskServiceImpl extends ServiceImpl list = ListOf.of(task); - if (!CollectionUtils.isEmpty(list)) { - List taskCodes = list.stream().map(SchBaseTask::getTask_code).collect(Collectors.toList()); - TableDataInfo response = wmsToAcsService.interationToExt(list, "createTask"); - if (!response.getCode().equals(String.valueOf(HttpStatus.HTTP_OK))) { - JSONArray results = (JSONArray) JSON.toJSON(response.getData()); - if (!CollectionUtils.isEmpty(results)) { - for (Object result : results) { - Map resultM = (Map) result; - taskCodes.remove(resultM.get("task_code")); - this.update(new UpdateWrapper() - .eq("task_code", resultM.get("task_code")) - .set("status", StatusEnum.FORM_STATUS.code("暂停")) - .set("update_time", DateUtil.now()).set("remark", resultM.get("msg"))); - } - } - } - if (!CollectionUtils.isEmpty(taskCodes)) { + JSONObject object = new JSONObject(); + object.put("vehicle_code",task.getVehicle_code()); + object.put("task_type","1"); + object.put("priority","1"); + object.put("start_point_code",task.getPoint_code1()); + object.put("next_point_code",task.getPoint_code2()); + object.put("agv_action_type","1"); + object.put("priority","1"); + object.put("task_code",task.getTask_code()); + TableDataInfo tableDataInfo = InterationUtil.notifyExt("/api/task", object); + if (!tableDataInfo.getCode().equals(String.valueOf(HttpStatus.HTTP_OK))) { this.update(new UpdateWrapper() - .set("status", StatusEnum.FORM_STATUS.code("下发")) - .in("task_code", taskCodes)); + .eq("task_code", task.getTask_code()) + .set("status", StatusEnum.FORM_STATUS.code("暂停")) + .set("update_time", DateUtil.now()).set("remark", "下发失败")); } + this.update(new UpdateWrapper() + .set("status", StatusEnum.FORM_STATUS.code("下发")) + .in("task_code", task.getTask_code())); } - } else { + else { this.update(new UpdateWrapper() .set("status", param.getString("status")) .eq("task_code", task_code)); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java index 8e76ad2c..3a30aadf 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java @@ -20,6 +20,7 @@ import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService; import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase; import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService; import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo; +import org.nl.wms.external_system.GateWayService; import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService; import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater; @@ -69,6 +70,7 @@ public class MdGruopDickServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); @@ -168,6 +170,8 @@ public class MdGruopDickServiceImpl extends ServiceImpl(TableDataInfo.build(),HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java index a74424b1..2f8f5ee1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java @@ -3,15 +3,19 @@ package org.nl.wms.stor_manage.struct.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import org.apache.commons.lang3.StringUtils; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.entity.PageQuery; +import org.nl.common.domain.exception.BadRequestException; import org.nl.common.utils.IdUtil; import org.nl.common.utils.ListOf; import org.nl.common.utils.MapOf; import org.nl.common.utils.SecurityUtils; +import org.nl.wms.base_manage.sect.service.IStIvtSectattrService; +import org.nl.wms.base_manage.sect.service.dao.StIvtSectattr; import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService; import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr; import org.nl.wms.stor_manage.struct.service.dto.StructattrQuery; @@ -42,6 +46,8 @@ public class StIvtStructattrController { private IStIvtStructattrService structattrService; @Autowired private ColumnInfoService columnInfoService; + @Autowired + private IStIvtSectattrService iStIvtSectattrService; @GetMapping @Log("仓位查询") @@ -57,6 +63,16 @@ public class StIvtStructattrController { dto.setCreate_id(SecurityUtils.getCurrentUserId()); dto.setCreate_name(SecurityUtils.getCurrentNickName()); dto.setCreate_time(DateUtil.now()); + String sect_code = dto.getSect_code(); + StIvtSectattr sect = iStIvtSectattrService.getOne(new QueryWrapper().eq("sect_code", sect_code)); + dto.setCol_num(0); + dto.setRow_num(0); + dto.setLayer_num(0); + dto.setBlock_num(0); + if (sect == null){ + throw new BadRequestException("库区信息不存在"); + } + dto.setStor_code(sect.getStor_code()); structattrService.save(dto); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/TaskScheduleService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/TaskScheduleService.java index 2e110107..4547670a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/TaskScheduleService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/TaskScheduleService.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.http.HttpStatus; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.RequiredArgsConstructor; @@ -12,6 +13,7 @@ import org.nl.common.TableDataInfo; import org.nl.common.enums.StatusEnum; import org.nl.common.utils.BaseCode; import org.nl.common.utils.IdUtil; +import org.nl.common.utils.InterationUtil; import org.nl.config.lucene.LuceneAppender; import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService; import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; @@ -65,25 +67,38 @@ public class TaskScheduleService { if (!CollectionUtils.isEmpty(list)){ List taskCodes = list.stream().map(SchBaseTask::getTask_code).collect(Collectors.toList()); log.info("---执行定时222任务:-----taskPublish-----"+ taskCodes); - TableDataInfo response = wmsToAcsService.interationToExt(list, "createTask"); - if (!response.getCode().equals(String.valueOf(HttpStatus.HTTP_OK))){ - JSONArray results = (JSONArray)JSON.toJSON(response.getData()); - if (!CollectionUtils.isEmpty(results)){ - for (Object result : results) { - Map resultM = (Map) result; - taskCodes.remove(resultM.get("task_code")); - iSchBaseTaskService.update(new UpdateWrapper() - .eq("task_code",resultM.get("task_code")) - .set("status",StatusEnum.FORM_STATUS.code("暂停")) - .set("update_time", DateUtil.now()).set("remark",resultM.get("msg"))); +// TableDataInfo response = wmsToAcsService.interationToExt(list, "createTask"); + for (SchBaseTask schBaseTask : list) { + JSONObject object = new JSONObject(); + object.put("vehicle_code",schBaseTask.getVehicle_code()); + object.put("task_type","1"); + object.put("priority","1"); + object.put("start_point_code",schBaseTask.getPoint_code1()); + object.put("next_point_code",schBaseTask.getPoint_code2()); + object.put("agv_action_type","1"); + object.put("priority","1"); + TableDataInfo tableDataInfo = InterationUtil.notifyExt("/api/task", object); + if (!tableDataInfo.getCode().equals(String.valueOf(HttpStatus.HTTP_OK))){ + JSONArray results = (JSONArray)JSON.toJSON(tableDataInfo.getData()); + if (!CollectionUtils.isEmpty(results)){ + for (Object result : results) { + Map resultM = (Map) result; + taskCodes.remove(resultM.get("task_code")); + iSchBaseTaskService.update(new UpdateWrapper() + .eq("task_code",schBaseTask.getTask_code()) + .set("status",StatusEnum.FORM_STATUS.code("暂停")) + .set("update_time", DateUtil.now()).set("remark",resultM.get("msg"))); + } } } + if (!CollectionUtils.isEmpty(taskCodes)){ + iSchBaseTaskService.update(new UpdateWrapper() + .set("status",StatusEnum.FORM_STATUS.code("下发")) + .in("task_code",schBaseTask.getTask_code())); + } } - if (!CollectionUtils.isEmpty(taskCodes)){ - iSchBaseTaskService.update(new UpdateWrapper() - .set("status",StatusEnum.FORM_STATUS.code("下发")) - .in("task_code",taskCodes)); - } + + } } }catch (Exception ex){ diff --git a/wms_pro/hd/nladmin-system/src/main/resources/config/application-prod.yml b/wms_pro/hd/nladmin-system/src/main/resources/config/application-prod.yml index de0a566b..47692738 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/config/application-prod.yml +++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application-prod.yml @@ -8,7 +8,7 @@ spring: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://${DB_HOST:192.168.8.218}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false - url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false + url: jdbc:mysql://${DB_HOST:192.168.81.251}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false username: ${DB_USER:root} password: ${DB_PWD:123456} diff --git a/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml b/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml index 8d0a04be..45cecdc9 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml +++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml @@ -6,7 +6,7 @@ spring: main: allow-bean-definition-overriding: true messages: - basename: language/status/status,language/login/login,language/error/error,language/buss/buss,language/task/task,language/monitor/one_device/one_device,language/monitor/two_device/two_device,language/monitor/universal/universal + basename: language/common/common,language/status/status,language/login/login,language/error/error,language/buss/buss,language/task/task,language/monitor/one_device/one_device,language/monitor/two_device/two_device,language/monitor/universal/universal freemarker: check-template-location: false profiles: diff --git a/wms_pro/qd/src/i18n/langs/chinese.js b/wms_pro/qd/src/i18n/langs/chinese.js index 7a81a85f..26ba5b4a 100644 --- a/wms_pro/qd/src/i18n/langs/chinese.js +++ b/wms_pro/qd/src/i18n/langs/chinese.js @@ -62,8 +62,10 @@ import classification2 from './basedata/classification/zh' import ivtChange from './ivtChange/zh' import eslog from './eslog/zh' import elpage from './elpage/zh' +import storage from './storage/struct/zh' export default { + ...storage, ...elpage, ...eslog, ...ivtChange, diff --git a/wms_pro/qd/src/i18n/langs/english.js b/wms_pro/qd/src/i18n/langs/english.js index d19f06fb..cc1c29ba 100644 --- a/wms_pro/qd/src/i18n/langs/english.js +++ b/wms_pro/qd/src/i18n/langs/english.js @@ -62,8 +62,10 @@ import classification2 from './basedata/classification/en' import ivtChange from './ivtChange/en' import eslog from './eslog/en' import elpage from './elpage/en' +import storage from './storage/struct/en' export default { + ...storage, ...elpage, ...eslog, ...ivtChange, diff --git a/wms_pro/qd/src/i18n/langs/espana.js b/wms_pro/qd/src/i18n/langs/espana.js index deea5976..dcbad180 100644 --- a/wms_pro/qd/src/i18n/langs/espana.js +++ b/wms_pro/qd/src/i18n/langs/espana.js @@ -57,9 +57,11 @@ import classification from './basedata/classification/es' import ivtChange from './ivtChange/en' import eslog from './eslog/es' import elpage from './elpage/es' +import storage from './storage/struct/es' export default { + ...storage, ...elpage, ...eslog, ...ivtChange, diff --git a/wms_pro/qd/src/views/wms/base_manage/struct/index.vue b/wms_pro/qd/src/views/wms/base_manage/struct/index.vue index aff192ec..11028df4 100644 --- a/wms_pro/qd/src/views/wms/base_manage/struct/index.vue +++ b/wms_pro/qd/src/views/wms/base_manage/struct/index.vue @@ -99,14 +99,14 @@ - - + + - {{ $t('common.true') }} - {{ $t('common.false') }} + true + false