From 3ceb2dab5358cc907a9535e6652ee07ea4d6a345 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 12 Jun 2023 16:33:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nladmin-system/doc/wms.xls | Bin 304640 -> 305664 bytes .../material/service/dao/MdBaseMaterial.java | 4 +- .../impl/PdmBdWorkorderServiceImpl.java | 2 + .../point/service/ISchBasePointService.java | 5 + .../service/impl/SchBasePointServiceImpl.java | 13 +- .../service/impl/SchBaseTaskServiceImpl.java | 3 +- .../nl/wms/sch/task_manage/AbstractTask.java | 15 +- .../src/views/wms/sch/point/PointDialog.vue | 173 ++++++++++++++++++ nladmin-ui/src/views/wms/sch/point/index.vue | 18 +- .../src/views/wms/sch/task/config/index.vue | 4 +- nladmin-ui/src/views/wms/sch/task/index.vue | 10 +- 11 files changed, 226 insertions(+), 21 deletions(-) create mode 100644 nladmin-ui/src/views/wms/sch/point/PointDialog.vue diff --git a/nladmin-system/doc/wms.xls b/nladmin-system/doc/wms.xls index 008ef4014d1234f84bbc224e5394c6efeb1c583f..5d713043e28def251478a6091a2896d30f33297a 100644 GIT binary patch delta 20142 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 delta 19969 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 M6LZ!EU6$4V0r>0Cga7~l diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java index ba85ce7..7ec52ab 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java @@ -48,10 +48,10 @@ public class MdBaseMaterial implements Serializable { private String remark; @ApiModelProperty(value = "是否启用") - private Integer is_used; + private Boolean is_used; @ApiModelProperty(value = "是否删除") - private Integer is_delete; + private Boolean is_delete; @ApiModelProperty(value = "创建人") private String create_id; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java index dc8b46f..4ad5956 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java @@ -46,6 +46,8 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl { */ void changeUsed(JSONObject jsonObject); + /** + * 获取点位 + * @param region + * @return + */ List getPointList(SchBasePoint region); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java index d9f4f43..d4612ee 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java @@ -54,6 +54,7 @@ public class SchBasePointServiceImpl extends ServiceImpl lam = new LambdaQueryWrapper<>(); lam.like(ObjectUtil.isNotEmpty(blurry), SchBasePoint::getPoint_code, blurry) .or(ObjectUtil.isNotEmpty(blurry), lam1 -> lam1.like(SchBasePoint::getPoint_name, blurry)) @@ -66,7 +67,8 @@ public class SchBasePointServiceImpl extends ServiceImpl slam.isNotNull(SchBasePoint::getIng_task_code) - .ne(SchBasePoint::getIng_task_code, "")); + .ne(SchBasePoint::getIng_task_code, "")) + .apply(parent_point, "point_code = parent_point_code"); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); pointMapper.selectPage(pages, lam); // 可以存放的载具类型 @@ -102,8 +104,10 @@ public class SchBasePointServiceImpl extends ServiceImpl() .eq(SchBaseTaskconfig::getConfig_code, config_code)); @@ -170,14 +170,14 @@ public abstract class AbstractTask { .findUnFinishTasksByTaskConfig(taskConfig.getConfig_code(), apply_point_code, taskConfig.getTask_direction()); Assert.isFalse(unFinishTasksByTaskConfig.size() >= tcmn, "该点位申请的任务未完成数已超过上限，无法申请任务"); - // 获取设备 + // 获取对接位点位对象 SchBasePoint pointObj = pointService.getOne(new LambdaQueryWrapper().eq(SchBasePoint::getPoint_code, apply_point_code)); // 判断是否校验工单 if (taskConfig.getIs_check_workorder()) { // 校验工单 - // 根据设备的父点位编码找到工单设备 - SchBasePoint one = pointService - .getOne(new LambdaQueryWrapper().eq(SchBasePoint::getPoint_code, pointObj.getParent_point_code())); + // 根据对接位的父点位编码(设备)找到工单设备 + SchBasePoint one = pointService.getOne(new LambdaQueryWrapper() + .eq(SchBasePoint::getPoint_code, pointObj.getParent_point_code())); // 查找当前设备、生产中、 PdmBdWorkorder workorder = workorderService.getOne(new LambdaQueryWrapper() .eq(PdmBdWorkorder::getPoint_code, one.getPoint_code()) @@ -189,6 +189,11 @@ public abstract class AbstractTask { // 设置任务数据 task.setVehicle_type(workorder.getVehicle_type()); } + // 校验是否需要自动agv + if (!pointObj.getIs_auto()) { + // 如果不需要自动，则不创建任务 + return; + } // 2、创建申请任务 task.setAcs_trace_id(param.getString("acs_trace_id")); task.setConfig_code(config_code); diff --git a/nladmin-ui/src/views/wms/sch/point/PointDialog.vue b/nladmin-ui/src/views/wms/sch/point/PointDialog.vue new file mode 100644 index 0000000..9e8849e --- /dev/null +++ b/nladmin-ui/src/views/wms/sch/point/PointDialog.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/nladmin-ui/src/views/wms/sch/point/index.vue b/nladmin-ui/src/views/wms/sch/point/index.vue index 515c92c..e4fa501 100644 --- a/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/nladmin-ui/src/views/wms/sch/point/index.vue @@ -204,6 +204,9 @@ /> + + + @@ -259,7 +262,7 @@ {{scope.row.ing_task_code?'是':'否'}} - + @@ -317,6 +321,7 @@ import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop' import ViewDialog from '@/views/wms/sch/point/ViewDialog.vue' +import PointDialog from '@/views/wms/sch/point/PointDialog.vue' const defaultForm = { point_code: null, @@ -352,7 +357,7 @@ const defaultForm = { export default { name: 'SchBasePoint', dicts: ['vehicle_type', 'TrueOrFalse'], - components: { ViewDialog, pagination, crudOperation, rrOperation, udOperation }, + components: { PointDialog, ViewDialog, pagination, crudOperation, rrOperation, udOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ @@ -396,7 +401,8 @@ export default { pointTypesList: [], pointStatusList: [], pointStatusDialogList: [], - pointTypesDialogList: [] + pointTypesDialogList: [], + pointDialog: false } }, created() { @@ -476,6 +482,12 @@ export default { if (row) { this.$refs.viewDialog.setParentData(row) } + }, + tableChanged(row) { + this.form.parent_point_code = row.point_code + }, + getParentPoint() { + this.pointDialog = true } } } diff --git a/nladmin-ui/src/views/wms/sch/task/config/index.vue b/nladmin-ui/src/views/wms/sch/task/config/index.vue index ff8a4a4..bac1cb2 100644 --- a/nladmin-ui/src/views/wms/sch/task/config/index.vue +++ b/nladmin-ui/src/views/wms/sch/task/config/index.vue @@ -151,7 +151,7 @@ - + 否 - + diff --git a/nladmin-ui/src/views/wms/sch/task/index.vue b/nladmin-ui/src/views/wms/sch/task/index.vue index 2e571f5..ea979f1 100644 --- a/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/nladmin-ui/src/views/wms/sch/task/index.vue @@ -195,11 +195,11 @@