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

add:任务页面

Browse Source
This commit is contained in:
zhangzq
2024-05-23 20:38:43 +08:00
parent d0c7534090
commit e28f6b6efc
20 changed files with 756 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java
View File

@@ -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;
/**
* <p>
@@ -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<Object> 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<Object> query(TaskQuery query, PageQuery pageQuery) {
Page<SchBaseTask> page = iSchBaseTaskService.page(pageQuery.build(), query.build());
return new ResponseEntity<>(TableDataInfo.build(page), HttpStatus.OK);
}
@GetMapping("/undo")
@Log("查询任务")
public ResponseEntity<Object> undo() {
int count = iSchBaseTaskService.count(new QueryWrapper<SchBaseTask>()
.lt("task_status", StatusEnum.FORM_STATUS.code("完成")));
return new ResponseEntity<>(count, HttpStatus.OK);
}
@PostMapping
@Log("新增任务")
public ResponseEntity<Object> 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<Object> update(@Validated @RequestBody JSONObject task) {
iSchBaseTaskService.updateById(task.toJavaObject(SchBaseTask.class));
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@DeleteMapping
@Log("删除任务")
public ResponseEntity<Object> 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<Object> taskOperation(@RequestBody JSONObject map) {
iSchBaseTaskService.operation(map);
return new ResponseEntity<>(HttpStatus.OK);
}
}

9
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/ISchBaseTaskService.java
View File

@@ -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;
/**
* <p>
* 任务表 服务类
@@ -16,4 +19,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface ISchBaseTaskService extends IService<SchBaseTask> {
void createTask(SchBaseTask task);
void operation(JSONObject param);
List<Map> getByVehicle(String vehicle_code);
}

13
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java
View File

@@ -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;
/**
* <p>
* 任务表 Mapper 接口
@@ -13,4 +17,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface SchBaseTaskMapper extends BaseMapper<SchBaseTask> {
@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<Map> getByVehicle(String vehicle_code);
}

45
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/TaskQuery.java Normal file
View File

@@ -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<SchBaseTask> {
/**
* 任务编码
*/
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());
}
}

17
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java
View File

@@ -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<SchBaseTaskMapper, SchBa
@Override
public void createTask(SchBaseTask task) {
this.save(task);
// wmsToAcsService.interationToExt(ListOf.of(task));
}
@Override
public List<Map> getByVehicle(String vehicle_code) {
if (StringUtils.isEmpty(vehicle_code)){
return new ArrayList<>();
}
return this.baseMapper.getByVehicle(vehicle_code);
}
@Override
public void operation(JSONObject param) {
}
}

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java
View File

@@ -43,7 +43,7 @@ public abstract class FlowNodeActivityBehavior<T> {
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<ActRuExecution>()

12
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/EndEventActivityBehavior.java
View File

@@ -46,9 +46,6 @@ public class EndEventActivityBehavior extends FlowNodeActivityBehavior<JSONObjec
@Override
public void execute(ExecutionEntity<JSONObject> entity) {
//流程结束：判断是否是子流程，是的话调用父流程
iActRuExecutionService.update(new UpdateWrapper<ActRuExecution>()
.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<JSONObjec
}
@Override
@SneakyThrows
public void leave(ExecutionEntity entity) {
public void leave(ExecutionEntity<JSONObject> entity) {
//流程结束：判断是否是子流程，是的话调用父流程
iActRuExecutionService.update(new UpdateWrapper<ActRuExecution>()
.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<ActRuExecution>()
.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<ActReProcdef>().eq(ActReProcdef::getDeployment_id, entity.getDeploymentId()));

7
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ServerTaskActivityBehavior.java
View File

@@ -28,8 +28,7 @@ public class ServerTaskActivityBehavior extends FlowNodeActivityBehavior<JSONObj
@Override
@Transactional
public void execute(ExecutionEntity<JSONObject> 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<JSONObj
}
JSONObject handler = typeHandler.handler(currentNode.getSkipExpression(), entity, null);
entity.setT(handler);
entity.setForm_id(form_id);
entity.setForm_type(form_type);
entity.setForm_id(entity.getForm_id());
entity.setForm_type(entity.getForm_type());
}
}
}

21
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StrucFormActivityBehavior.java
View File

@@ -79,14 +79,15 @@ public class StrucFormActivityBehavior extends FlowNodeActivityBehavior<JSONObje
//该参数里包含三部分：主数据基础字段，组数据自定义及明细，
//明细：基础字段，组数据自定义及参数:
//TODO:id,code等非映射字段后续可以通过SpringEL表达式生成
handler.put("id",IdUtil.getStringId());
handler.put("create_time",DateUtil.now());
handler.put("form_type",entity.getForm_type());
handler.put("create_name",SecurityUtils.getCurrentNickName());
handler.put("status",StatusEnum.FORM_STATUS.code("生成"));
handler.put("code",CodeUtil.getNewCode(currentNode.getForm_type()));
PmFormData mst = handler.toJavaObject(PmFormData.class);
JSONObject mst_json = handler.getJSONObject("t");
mst_json.put("id",IdUtil.getStringId());
mst_json.put("create_time",DateUtil.now());
mst_json.put("form_type",targetStruc.getForm_type());
mst_json.put("create_name",SecurityUtils.getCurrentNickName());
mst_json.put("status",StatusEnum.FORM_STATUS.code("生成"));
mst_json.put("code",CodeUtil.getNewCode(currentNode.getForm_type()));
PmFormData mst = mst_json.toJavaObject(PmFormData.class);
handler.put("form_id",mst.getId());
JSONArray itemArr = handler.getJSONArray("item");
if(itemArr !=null){
for (int i = 0; i < itemArr.size(); i++) {
@@ -100,8 +101,8 @@ public class StrucFormActivityBehavior extends FlowNodeActivityBehavior<JSONObje
}
iPmFormDataService.save(mst);
entity.setT(handler);
entity.setForm_id(mst.getId());
entity.setForm_type(currentNode.getForm_type());
entity.setForm_id(entity.getForm_id());
entity.setForm_type(entity.getForm_type());
}
}
}

1
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/DecisionHandler.java
View File

@@ -57,6 +57,7 @@ public class DecisionHandler extends TypeHandler<JSONObject,ExecutionEntity<JSON
List<StIvtStructattr> list = iStIvtStructattrService.list(new QueryWrapper<StIvtStructattr>()
.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("当前分配策略无可用货位");

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
View File

@@ -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<MdGruopDickMapper, MdGru
forms.put("create_time", now);
forms.put("id",IdUtil.getStringId());
forms.put("id",IdUtil.getStringId());
forms.put("status", StatusEnum.FORM_STATUS.code("生成"));
forms.put("code", CodeUtil.getNewCode("md_group_dick"));
MdGruopDick mdGroupMst = forms.toJavaObject(MdGruopDick.class);

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/in/StIvtIostorinvInController.java
View File

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.entity.PageQuery;
import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
import org.nl.wms.stor_manage.io.service.dto.StorInvQuery;
import org.nl.wms.stor_manage.io.service.in.iostor.IStIvtIostorinvInService;
import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn;
@@ -33,6 +34,8 @@ public class StIvtIostorinvInController {
IStIvtIostorinvInService iStIvtIostorinvInService;
@Autowired
IStIvtIostorinvdtlService iStIvtIostorinvDtlInService;
@Autowired
ISchBaseTaskService schBaseTaskService;
@GetMapping

23
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java
View File

@@ -11,6 +11,8 @@ import org.nl.common.anno.Log;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.enums.StatusEnum;
import org.nl.common.utils.MapOf;
import org.nl.wms.system_manage.service.dict.ISysDictService;
import org.nl.wms.system_manage.service.dict.dao.Dict;
import org.nl.wms.system_manage.service.dict.dto.DictQuery;
@@ -19,10 +21,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
/**
* <p>
@@ -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<Object> getAcsTaskType(@PathVariable String type) {
List<Map> items = new ArrayList<>();
for (StatusEnum value : StatusEnum.values()) {
if (value.name().equals(type)){
Map<String, String> 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);
}
}