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 c36cbeb4..ce1e9ae3 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,9 +1,31 @@ package org.nl.wms.dispatch_manage.task.controller; -import org.springframework.web.bind.annotation.RequestMapping; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.enums.StatusEnum; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService; +import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; +import org.nl.wms.dispatch_manage.task.service.dto.TaskQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.util.CollectionUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RestController; +import java.util.Arrays; +import java.util.List; +import java.util.Map; /** *

@@ -14,8 +36,69 @@ import org.springframework.web.bind.annotation.RestController; * @since 2024-05-06 */ @RestController -@RequestMapping("/schBaseTask") +@RequestMapping("api/schBaseTask") public class SchBaseTaskController { + @Autowired + private ISchBaseTaskService iSchBaseTaskService; + + @PostMapping("getVehicleTask") + public ResponseEntity getVehicleTask(@RequestBody JSONObject param) { + if (CollectionUtils.isEmpty(param)){ + throw new BadRequestException("参数不能为空"); + } + return new ResponseEntity<>(iSchBaseTaskService.getByVehicle(param.getString("vehicle_code")), HttpStatus.OK); + } + + @GetMapping + @Log("查询任务") + public ResponseEntity query(TaskQuery query, PageQuery pageQuery) { + Page page = iSchBaseTaskService.page(pageQuery.build(), query.build()); + return new ResponseEntity<>(TableDataInfo.build(page), HttpStatus.OK); + } + + + @GetMapping("/undo") + @Log("查询任务") + public ResponseEntity undo() { + int count = iSchBaseTaskService.count(new QueryWrapper() + .lt("task_status", StatusEnum.FORM_STATUS.code("完成"))); + return new ResponseEntity<>(count, HttpStatus.OK); + } + + @PostMapping + @Log("新增任务") + public ResponseEntity create(@RequestBody JSONObject task) { + SchBaseTask schBaseTask = task.toJavaObject(SchBaseTask.class); + schBaseTask.setId(IdUtil.getStringId()); + schBaseTask.setCreate_name(SecurityUtils.getCurrentNickName()); + schBaseTask.setCreate_time(DateUtil.now()); + iSchBaseTaskService.save(schBaseTask); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改任务") + public ResponseEntity update(@Validated @RequestBody JSONObject task) { + iSchBaseTaskService.updateById(task.toJavaObject(SchBaseTask.class)); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @DeleteMapping + @Log("删除任务") + public ResponseEntity delete(@RequestBody String[] ids) { + if (ids!=null && ids.length>0){ + iSchBaseTaskService.removeByIds(Arrays.asList(ids)); + } + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/operation") + @Log("任务操作") + public ResponseEntity taskOperation(@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/ISchBaseTaskService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/ISchBaseTaskService.java index 8ab7381f..52609dbc 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/ISchBaseTaskService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/ISchBaseTaskService.java @@ -5,6 +5,9 @@ import com.alibaba.fastjson.JSONObject; import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; +import java.util.Map; + /** *

* 任务表 服务类 @@ -16,4 +19,10 @@ import com.baomidou.mybatisplus.extension.service.IService; public interface ISchBaseTaskService extends IService { void createTask(SchBaseTask task); + + void operation(JSONObject param); + + + List getByVehicle(String vehicle_code); + } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java index 133c98c9..302e5354 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java @@ -1,8 +1,12 @@ package org.nl.wms.dispatch_manage.task.service.dao.mapper; +import org.apache.ibatis.annotations.Select; import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +import java.util.Map; + /** *

* 任务表 Mapper 接口 @@ -13,4 +17,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface SchBaseTaskMapper extends BaseMapper { + @Select("SELECT\n" + + "\tsch_base_task.*, md_pb_vehicleMater.*,md_me_materialbase.material_code,md_me_materialbase.material_name,md_me_materialbase.material_spec\n" + + "FROM\n" + + "\tsch_base_task\n" + + "\tLEFT JOIN md_pb_vehicleMater ON sch_base_task.vehicle_code = md_pb_vehicleMater.vehicle_code \n" + + "\tleft join md_me_materialbase on md_pb_vehicleMater.material_id = md_me_materialbase.material_id\n" + + "WHERE\n" + + "\tsch_base_task.vehicle_code = #{vehicle_code}") + List getByVehicle(String vehicle_code); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/TaskQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/TaskQuery.java new file mode 100644 index 00000000..e3be7831 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/TaskQuery.java @@ -0,0 +1,45 @@ +package org.nl.wms.dispatch_manage.task.service.dto; + +import lombok.Data; +import org.nl.common.domain.entity.BaseQuery; +import org.nl.common.domain.entity.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; + +/* + * @author ZZQ + * @Date 2024/5/23 20:10 + */ +@Data +public class TaskQuery extends BaseQuery { + /** + * 任务编码 + */ + private String task_code; + /** + * 任务类型 + */ + private String task_type; + /** + * Acs任务类型 + */ + private String acs_type; + /** + * 任务状态 + */ + private String task_status; + /** + * 点位 + */ + private String point_code; + /** + * 载具编码1 + */ + private String vehicle_code; + + + @Override + public void paramMapping() { + super.doP.put("point_code", QParam.builder().k(new String[]{"point_code1","point_code2"}).type(QueryTEnum.ORLK).build()); + } +} 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 8509649f..ca7f1b13 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 @@ -1,6 +1,7 @@ package org.nl.wms.dispatch_manage.task.service.impl; import com.alibaba.fastjson.JSONObject; +import org.apache.commons.lang3.StringUtils; import org.nl.common.utils.ListOf; import org.nl.wms.dispatch_manage.task.handler.TaskHandler; import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; @@ -11,6 +12,8 @@ import org.nl.wms.external_system.acs.service.WmsToAcsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,6 +34,18 @@ public class SchBaseTaskServiceImpl extends ServiceImpl getByVehicle(String vehicle_code) { + if (StringUtils.isEmpty(vehicle_code)){ + return new ArrayList<>(); + } + return this.baseMapper.getByVehicle(vehicle_code); + } + + @Override + public void operation(JSONObject param) { + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java index 2dd0308e..c5759bf1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java @@ -43,7 +43,7 @@ public abstract class FlowNodeActivityBehavior { IActRuExecutionService iActRuExecutionService = SpringContextHolder.getBean(IActRuExecutionService.class); try { - //当前节点 + //当前节点:子节点更换form_type log.info("流程:{},开始流程数据:{}", entity.getActivityName(),JSONObject.toJSONString(entity.getT())); if (StringUtils.isNotEmpty(entity.getProc_inst_id())){ iActRuExecutionService.update(new UpdateWrapper() diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/EndEventActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/EndEventActivityBehavior.java index 05837f0b..22496776 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/EndEventActivityBehavior.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/EndEventActivityBehavior.java @@ -46,9 +46,6 @@ public class EndEventActivityBehavior extends FlowNodeActivityBehavior entity) { //流程结束：判断是否是子流程，是的话调用父流程 - iActRuExecutionService.update(new UpdateWrapper() - .eq("proc_inst_id",entity.getProc_inst_id()) - .set("status", StatusEnum.FLOW_STATUS.code("完成"))); JSONObject data = entity.getT(); ExecutionDto executionDto = data.toJavaObject(ExecutionDto.class); @@ -59,14 +56,17 @@ public class EndEventActivityBehavior extends FlowNodeActivityBehavior entity) { + //流程结束：判断是否是子流程，是的话调用父流程 + iActRuExecutionService.update(new UpdateWrapper() + .eq("proc_inst_id",entity.getProc_inst_id()) + .set("status", StatusEnum.FLOW_STATUS.code("完成"))); ActRuExecution execution = iActRuExecutionService.getById(entity.getProc_inst_id()); if (StringUtils.isNotEmpty(execution.getParent_id())){ //判断当前所有子流程是否都完成：全都完成则执行父流程 int count = iActRuExecutionService.count(new QueryWrapper() .eq("parent_id", execution.getParent_id()) - .ne("status", StatusEnum.FLOW_STATUS.code("节点完成"))); + .lt("status", StatusEnum.FLOW_STATUS.code("完成"))); if (count == 0){ ActRuExecution parent = iActRuExecutionService.getById(entity.getParent_id()); ActReProcdef deployment = reProcdefService.getOne(new LambdaUpdateWrapper().eq(ActReProcdef::getDeployment_id, entity.getDeploymentId())); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ServerTaskActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ServerTaskActivityBehavior.java index e37a93c6..6706f5cf 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ServerTaskActivityBehavior.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ServerTaskActivityBehavior.java @@ -28,8 +28,7 @@ public class ServerTaskActivityBehavior extends FlowNodeActivityBehavior entity) { - String form_id = entity.getForm_id(); - String form_type = entity.getForm_type(); + FlowElement element = entity.getCurrentFlowElement(); ServerTask currentNode = (ServerTask) element; if (!CollectionUtils.isEmpty(currentNode.getSkipExpression())) { @@ -39,8 +38,8 @@ public class ServerTaskActivityBehavior extends FlowNodeActivityBehavior list = iStIvtStructattrService.list(new QueryWrapper() .eq("vehicle_code", "") .eq("is_used", true) + .eq("lock_type", StatusEnum.LOCK.code("无")) .eq("stor_code",iostorinvdtlIn.getStor_code())); if (CollectionUtils.isEmpty(list)){ throw new BadRequestException("当前分配策略无可用货位"); 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 22980bb3..760c603b 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 @@ -8,6 +8,7 @@ import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; import org.nl.common.TableDataInfo; import org.nl.common.domain.entity.PageQuery; +import org.nl.common.enums.StatusEnum; import org.nl.common.publish.BussEventMulticaster; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.IdUtil; @@ -77,6 +78,7 @@ public class MdGruopDickServiceImpl extends ServiceImpl @@ -120,5 +119,21 @@ public class SysDictController { return new ResponseEntity<>(TableDataInfo.build(dictService.getDictByName(code.getString("code"))),HttpStatus.OK); } + @GetMapping("/getStatusEnum/{type}") + @Log("获取acs任务类型列表") + @SaIgnore + public ResponseEntity getAcsTaskType(@PathVariable String type) { + List items = new ArrayList<>(); + for (StatusEnum value : StatusEnum.values()) { + if (value.name().equals(type)){ + Map code = value.getCode(); + for (String label : code.keySet()) { + items.add(MapOf.of("label",label,"value",code.get(label))); + } + break; + } + } + return new ResponseEntity<>(items, HttpStatus.OK); + } } diff --git a/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue new file mode 100644 index 00000000..1ab42a7f --- /dev/null +++ b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue @@ -0,0 +1,441 @@ + + + + + diff --git a/wms_pro/qd/src/views/wms/dispatch_manage/task/task.js b/wms_pro/qd/src/views/wms/dispatch_manage/task/task.js new file mode 100644 index 00000000..81438bb9 --- /dev/null +++ b/wms_pro/qd/src/views/wms/dispatch_manage/task/task.js @@ -0,0 +1,85 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/schBaseTask', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/schBaseTask', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/schBaseTask', + method: 'put', + data + }) +} + +export function getTaskStatus() { + return request({ + url: 'api/schBaseTask/taskStatus', + method: 'get' + }) +} + +export function getTaskType() { + return request({ + url: 'api/schBaseTask/taskType', + method: 'post' + }) +} +export function getAcsTaskType() { + return request({ + url: 'api/schBaseTask/acsTaskType', + method: 'get' + }) +} +export function undo() { + return request({ + url: 'api/schBaseTask/undo', + method: 'get' + }) +} + +export function getFinishType() { + return request({ + url: 'api/schBaseTask/finishType', + method: 'get' + }) +} + +export function operation(data) { + return request({ + url: 'api/schBaseTask/operation', + method: 'put', + data + }) +} +export function scheduler() { + return request({ + url: '/api/schBaseTask/task/taskPublish', + method: 'get' + }) +} + +export default { + add, + edit, + del, + operation, + getTaskStatus, + getTaskType, + getAcsTaskType, + getFinishType, + scheduler, + undo +} diff --git a/wms_pro/qd/src/views/wms/pm_manage/form_data/ViewDialog.vue b/wms_pro/qd/src/views/wms/pm_manage/form_data/ViewDialog.vue index 2da539a9..c23142ec 100644 --- a/wms_pro/qd/src/views/wms/pm_manage/form_data/ViewDialog.vue +++ b/wms_pro/qd/src/views/wms/pm_manage/form_data/ViewDialog.vue @@ -219,7 +219,7 @@ export default { }, queryTableDdis() { if (this.currentdtl !== null) { - crudProductIn.getIosInvDis({'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id}).then(res => { + crudProductIn.getVehicleTask({'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id}).then(res => { this.tabledis = res }).catch(() => { this.tabledis = [] diff --git a/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue b/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue index 374c7bdb..1b9bacb7 100644 --- a/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue +++ b/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue @@ -228,6 +228,7 @@ export default { formstruc.getHeader(this.query.form_type).then(res => { this.cols = res res.forEach(a => { + this.form.form_data[a.value,''] this.$set(this.query, 'form_query', {}) }) }) diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/DivDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/in/DivDialog.vue index e2d922ac..c5c5be39 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/in/DivDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/in/DivDialog.vue @@ -359,7 +359,7 @@ export default { clcikRow(row, column, event) { this.form.dtl_row = row this.form.storage_qty = this.form.dtl_row.plan_qty - crudProductIn.getIosInvDis({ 'iostorinv_id': row.iostorinv_id, 'iostorinvdtl_id': row.iostorinvdtl_id }).then(res => { + crudProductIn.getVehicleTask({ 'iostorinv_id': row.iostorinv_id, 'iostorinvdtl_id': row.iostorinvdtl_id }).then(res => { if (res.length !== 0) { this.form.tableMater = res diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue index f411e0d7..1adcd516 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue @@ -144,13 +144,15 @@ - + - - - + + + + + @@ -222,15 +224,7 @@ export default { stateFormat(row, column) { return this.dict.label.FORM_STATUS[row.bill_status] }, - taskdtl_typeFormat(row) { - return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type] - }, - task_statusFormat(row) { - return this.dict.label.task_status[row.task_status] - }, - work_statusFormat(row) { - return this.dict.label.work_status[row.work_status] - }, + handleDtlCurrentChange(current) { if (current !== null) { this.tabledis = [] @@ -258,7 +252,7 @@ export default { }, queryTableDdis() { if (this.currentdtl !== null) { - crudProductIn.getIosInvDis({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => { + crudProductIn.getVehicleTask({ 'vehicle_code': this.currentdtl.vehicle_code }).then(res => { this.tabledis = res }).catch(() => { this.tabledis = [] @@ -266,7 +260,7 @@ export default { } }, formatStatus(row) { - return this.dict.label.task_status[row.task_status] + return this.dict.label.FORM_STATUS[row.task_status] }, formatBaseType(row) { return this.dict.label.PCS_SAL_TYPE[row.base_bill_type] diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/storinvin.js b/wms_pro/qd/src/views/wms/stor_manage/in/storinvin.js index acc5fe2c..e16d1181 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/in/storinvin.js +++ b/wms_pro/qd/src/views/wms/stor_manage/in/storinvin.js @@ -38,9 +38,9 @@ export function getPoint(data) { data }) } -export function getIosInvDis(data) { +export function getVehicleTask(data) { return request({ - url: '/api/stIvtIostorinvIn/getIosInvDis', + url: '/api/schBaseTask/getVehicleTask', method: 'post', data }) @@ -137,7 +137,7 @@ export default { add, edit, del, - getIosInvDis, + getVehicleTask, getIosInvDtl, vehicleCheck, confirmvehicle,