From 9a4ed5895ade42a9e1dfb9c6f3fe50b34a600672 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 31 Jul 2025 16:53:26 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StIvtUserShopController.java | 53 +++ .../service/IStIvtUsershopService.java | 52 +++ .../workshop/service/dao/StIvtUsershop.java | 38 +++ .../dao/mapper/StIvtUsershopMapper.java | 22 ++ .../dao/mapper/StIvtUsershopMapper.xml | 23 ++ .../impl/StIvtUsershopServiceImpl.java | 83 +++++ .../wms/ext/acs/service/WmsToAcsService.java | 9 + .../acs/service/impl/WmsToAcsServiceImpl.java | 9 + .../mes/service/impl/MesToWmsServiceImpl.java | 23 +- .../service/dao/mapper/SchBaseTaskMapper.java | 2 +- .../service/dao/mapper/SchBaseTaskMapper.xml | 6 + .../service/impl/SchBaseTaskServiceImpl.java | 11 +- .../sch/task_manage/GeneralDefinition.java | 4 + .../nl/wms/sch/task_manage/task/AcsUtil.java | 45 +++ .../task/tasks/fj/BZXDMTHCTask.java | 2 + .../task/tasks/fj/CPJDBLXWTask.java | 2 + .../task/tasks/fj/CPJDGHJTask.java | 2 + .../task/tasks/fj/CPJDYHSZTask.java | 2 + .../task/tasks/fj/CPJDZBJTask.java | 2 + .../task_manage/task/tasks/fj/KABDMTask.java | 2 + .../task/tasks/fj/KCPJTZPTask.java | 2 + .../task_manage/task/tasks/fj/KDMABTask.java | 2 + .../task/tasks/fj/KTPDZBJTask.java | 2 + .../task_manage/task/tasks/fj/MABCPJTask.java | 2 + .../task_manage/task/tasks/fj/MABCTask.java | 2 + .../task_manage/task/tasks/fj/MABDMTask.java | 2 + .../task/tasks/fj/MABGPTHJTask.java | 2 + .../task_manage/task/tasks/fj/MBZCPTask.java | 2 + .../task_manage/task/tasks/fj/MCDMTask.java | 2 + .../task_manage/task/tasks/fj/MCDTask.java | 2 + .../task_manage/task/tasks/fj/MDDMTask.java | 2 + .../task_manage/task/tasks/fj/MDMCPTask.java | 2 + .../task_manage/task/tasks/fj/MDMCTask.java | 2 + .../task/tasks/fj/MGPTHJABTask.java | 2 + .../task/tasks/fj/MGPTHJCPTask.java | 2 + .../task/tasks/fj/MTHCDCPJTask.java | 2 + .../task/tasks/fj/PUBLICLPQTask.java | 2 + .../task/tasks/fj/PUBMOVETask.java | 2 + .../task_manage/task/tasks/fj/TWOPUBTask.java | 150 ++++++++ .../views/wms/basedata/userworkshop/index.vue | 322 ++++++++++++++++++ .../wms/basedata/userworkshop/userStor.js | 43 +++ 41 files changed, 939 insertions(+), 4 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/StIvtUserShopController.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IStIvtUsershopService.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/StIvtUsershop.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/StIvtUsershopMapper.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/StIvtUsershopMapper.xml create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/StIvtUsershopServiceImpl.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/TWOPUBTask.java create mode 100644 lms/nladmin-ui/src/views/wms/basedata/userworkshop/index.vue create mode 100644 lms/nladmin-ui/src/views/wms/basedata/userworkshop/userStor.js diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/StIvtUserShopController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/StIvtUserShopController.java new file mode 100644 index 0000000..4d304d8 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/StIvtUserShopController.java @@ -0,0 +1,53 @@ +package org.nl.wms.database.workshop.controller; + + +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.base.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.database.workshop.service.IMdBaseWorkshopService; +import org.nl.wms.database.workshop.service.IStIvtUsershopService; +import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.Set; + +/** + * @author lyd + * @date 2023-05-05 + **/ +@Slf4j +@RestController + +@RequestMapping("/api/userStor") +public class StIvtUserShopController { + + @Autowired + private IStIvtUsershopService iStIvtUsershopService; + + @GetMapping + @Log("查询人员信息") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(iStIvtUsershopService.queryAll(whereJson, page)), HttpStatus.OK); + } + + @PostMapping("/save") + @Log("保存用户车间信息") + public ResponseEntity save(@RequestBody JSONObject whereJson) { + iStIvtUsershopService.save(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/queryUserStor") + @Log("查询用户对应车间") + public ResponseEntity queryUserStor(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(iStIvtUsershopService.queryUserStor(whereJson), HttpStatus.OK); + } + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IStIvtUsershopService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IStIvtUsershopService.java new file mode 100644 index 0000000..3aa9468 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IStIvtUsershopService.java @@ -0,0 +1,52 @@ +package org.nl.wms.database.workshop.service; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.database.workshop.service.dao.StIvtUsershop; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 服务类 + *

+ * + * @author author + * @since 2025-07-31 + */ +public interface IStIvtUsershopService extends IService { + + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 保存 + * + * @param whereJson / + */ + void save(JSONObject whereJson); + + /** + * 查询用户对应车间 + * + * @param whereJson / + */ + List queryUserStor(JSONObject whereJson); + + /** + * 查询人员对应车间公共方法 + * @return List + */ + List getWorkShop(); + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/StIvtUsershop.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/StIvtUsershop.java new file mode 100644 index 0000000..0f47499 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/StIvtUsershop.java @@ -0,0 +1,38 @@ +package org.nl.wms.database.workshop.service.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 人员权限车间 + *

+ * + * @author author + * @since 2025-07-31 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("st_ivt_usershop") +public class StIvtUsershop implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 用户id + */ + @TableId(value = "user_id") + private String user_id; + + /** + * 车间编码 + */ + private String work_shop; + + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/StIvtUsershopMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/StIvtUsershopMapper.java new file mode 100644 index 0000000..b97d152 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/StIvtUsershopMapper.java @@ -0,0 +1,22 @@ +package org.nl.wms.database.workshop.service.dao.mapper; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.wms.database.workshop.service.dao.StIvtUsershop; +import org.nl.wms.sch.task.service.dao.SchBaseTask; + +import java.util.Map; + +/** + *

+ * Mapper 接口 + *

+ * + * @author author + * @since 2025-07-31 + */ +public interface StIvtUsershopMapper extends BaseMapper { + + IPage selectPageLeftJoin(IPage pages, Map whereJson); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/StIvtUsershopMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/StIvtUsershopMapper.xml new file mode 100644 index 0000000..3ec7803 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/StIvtUsershopMapper.xml @@ -0,0 +1,23 @@ + + + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/StIvtUsershopServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/StIvtUsershopServiceImpl.java new file mode 100644 index 0000000..8b8ddf0 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/StIvtUsershopServiceImpl.java @@ -0,0 +1,83 @@ +package org.nl.wms.database.workshop.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.database.workshop.service.IStIvtUsershopService; +import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop; +import org.nl.wms.database.workshop.service.dao.StIvtUsershop; +import org.nl.wms.database.workshop.service.dao.mapper.StIvtUsershopMapper; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + *

+ * 服务实现类 + *

+ * + * @author author + * @since 2025-07-31 + */ +@Service +public class StIvtUsershopServiceImpl extends ServiceImpl implements IStIvtUsershopService { + + @Override + public IPage queryAll(Map whereJson, PageQuery page) { + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + pages = this.baseMapper.selectPageLeftJoin(pages, whereJson); + return pages; + } + + @Override + public void save(JSONObject whereJson) { + JSONObject jo = whereJson.getJSONObject("jo"); + JSONArray rows = whereJson.getJSONArray("rows"); + String user_id = jo.getString("user_id"); + this.removeById(user_id); + for (int i = 0; i < rows.size(); i++) { + JSONObject row = rows.getJSONObject(i); + String work_shop = row.getString("work_shop"); + StIvtUsershop stIvtUsershop = new StIvtUsershop(); + stIvtUsershop.setUser_id(user_id); + stIvtUsershop.setWork_shop(work_shop); + this.save(stIvtUsershop); + } + } + + @Override + public List queryUserStor(JSONObject whereJson) { + String user_id = whereJson.getString("user_id"); + List list = this.list( + new QueryWrapper().lambda() + .eq(StIvtUsershop::getUser_id, user_id) + ); + return list; + } + + @Override + public List getWorkShop() { + String currentUserId = SecurityUtils.getCurrentUserId(); + List list = this.list( + new QueryWrapper().lambda() + .eq(StIvtUsershop::getUser_id, currentUserId) + ); + List collect = list.stream() + .map(StIvtUsershop::getWork_shop) + .collect(Collectors.toList()); + + if (ObjectUtil.isEmpty(collect)) { + collect = null; + } + return collect; + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java index dd85e84..209dac4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java @@ -25,6 +25,15 @@ public interface WmsToAcsService { */ AcsResponse renotifyAcs(List list); + /** + * 下发任务2骑 + * 统一在这里维护 + * + * @param list: 任务链表 + * @return + */ + AcsResponse renotifyAcs2(List list); + /** * 下发信号 - 覆膜机释放托盘 * diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java index 0f6a377..f733904 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java @@ -36,6 +36,15 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { return resultForAcs; } + @Override + public AcsResponse renotifyAcs2(List list) { + String api = "api/wms/task"; + AcsResponse resultForAcs = AcsUtil.notifyAcs3(api, IssueAcsRequest.buildRequestObj("下发任务", list)); + // 记录日志 +// interactRecordService.saveRecord("下发任务", list, resultForAcs, GeneralDefinition.LMS_ACS); + return resultForAcs; + } + @Override public ResultForAcs getVehicleForLaminatingMachine(List list) { String api = "/api/wms/action"; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java index 4db60ad..8757712 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java @@ -106,7 +106,13 @@ public class MesToWmsServiceImpl implements MesToWmsService { jsonErro.put("MsgTime", DateUtil.now()); erroList.add(jsonErro); } else { - jsonItem.put("task_type",json.getString("task_type")); + // 判断是否是二期任务 + if (jsonItem.getString("TaskType").equals("BLGT")) { + jsonItem.put("task_type","TWOPUBTask"); + } else { + jsonItem.put("task_type",json.getString("task_type")); + } + taskCreateList.add(jsonItem); } } @@ -125,7 +131,20 @@ public class MesToWmsServiceImpl implements MesToWmsService { } // 调用下发acs - AcsResponse acsResponse = wmsToAcsService.renotifyAcs(sendAcsList); + // 判断是否二期任务 + AcsResponse acsResponse ; + boolean isTwo = sendAcsList.stream() + .allMatch(row -> row.getDtl_type().equals("2")); + boolean isOne = sendAcsList.stream() + .allMatch(row -> row.getDtl_type().equals("1")); + if (isTwo) { + acsResponse = wmsToAcsService.renotifyAcs2(sendAcsList); + } else if (isOne) { + acsResponse = wmsToAcsService.renotifyAcs(sendAcsList); + } else { + throw new BadRequestException("不能一起发送一期任务和二期任务!"); + } + if (acsResponse.getCode() == HttpStatus.HTTP_BAD_REQUEST) { // 说明有报错，处理报错内容 List resultErroList = acsResponse.getErrArr().toJavaList(JSONObject.class); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java index f9d6803..c19c523 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java @@ -20,5 +20,5 @@ public interface SchBaseTaskMapper extends BaseMapper { int getCarryingByDevice(String deviceCode, String taskConfig); - IPage selectPageLeftJoin(IPage pages, SchBaseTaskQuery whereJson, List collect); + IPage selectPageLeftJoin(IPage pages, SchBaseTaskQuery whereJson, List collect, List shopList); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml index acdfbe9..93e97a8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml @@ -70,6 +70,12 @@ #{code} + + AND t.workshop_code IN + + #{work_shop} + + ORDER BY t.create_time DESC diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java index 0d68029..d27b188 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java @@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; +import org.nl.wms.database.workshop.service.IStIvtUsershopService; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; @@ -51,6 +52,10 @@ public class SchBaseTaskServiceImpl extends ServiceImpl queryAll(SchBaseTaskQuery whereJson, PageQuery page) { List collect = ObjectUtil.isNotEmpty(whereJson.getMore_task_status()) @@ -62,7 +67,11 @@ public class SchBaseTaskServiceImpl extends ServiceImpl pages = new Page<>(page.getPage() + 1, page.getSize()); - pages = schBaseTaskMapper.selectPageLeftJoin(pages, whereJson, collect); + List shopList = iStIvtUsershopService.getWorkShop(); + if (ObjectUtil.isEmpty(shopList)) { + return pages; + } + pages = schBaseTaskMapper.selectPageLeftJoin(pages, whereJson, collect,shopList); return pages; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java index 0edd2eb..2c37878 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java @@ -149,6 +149,10 @@ public class GeneralDefinition { * ACS路径 */ public static final String ACS_URL = "acs_url"; + /** + * ACS路径 + */ + public static final String ACS_URL2 = "acs_url2"; /** * 是否连接 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java index df05a58..044a6d3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java @@ -113,6 +113,51 @@ public class AcsUtil { return resultForAcs; } + /** + * 二期任务 + * 新的请求方式：对象中包含数组 + * + * @param api + * @param object + * @param + * @return + */ + public static AcsResponse notifyAcs3(String api, T object) { + SysParamServiceImpl sysParamService = SpringContextHolder.getBean(SysParamServiceImpl.class); + //判断是否连接ACS系统 + Param isConnectAcs = sysParamService.findByCode(GeneralDefinition.IS_CONNECT_ACS); + if (ObjectUtil.isEmpty(isConnectAcs)) { + return AcsResponse.requestRefuse("参数表中：" + GeneralDefinition.IS_CONNECT_ACS + "不存在"); + } + String isConnect = isConnectAcs.getValue(); + //ACS地址：127.0.0.1:8010 + Param acsUrlObj = sysParamService.findByCode(GeneralDefinition.ACS_URL2); + if (ObjectUtil.isEmpty(acsUrlObj)) { + return AcsResponse.requestRefuse("参数表中：" + GeneralDefinition.ACS_URL2 + "不存在"); + } + String acsUrl = acsUrlObj.getValue(); + JSONObject result; + if (StrUtil.equals(GeneralDefinition.NO, isConnect)) { + return AcsResponse.requestRefuse("未连接ACS!"); + } + String url = acsUrl + api; + log.info("下发acs任务的参数为:{}", object.toString()); + AcsResponse resultForAcs; + try { + String resultMsg = HttpRequest.post(url) + .body(JSON.toJSONString(object)) + .execute().body(); + result = JSONObject.parseObject(resultMsg); + resultForAcs = JSONObject.toJavaObject(result, AcsResponse.class); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + log.error("连接失败：{}", msg); + return AcsResponse.requestRefuse("网络不通,操作失败!"); + } + return resultForAcs; + } + public static JSONObject cancelTask(String api, JSONObject taskCode) { JSONObject result = new JSONObject(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/BZXDMTHCTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/BZXDMTHCTask.java index 7c5cede..0400b94 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/BZXDMTHCTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/BZXDMTHCTask.java @@ -54,6 +54,7 @@ public class BZXDMTHCTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -70,6 +71,7 @@ public class BZXDMTHCTask extends AbstractTask { acsTaskDto.setNext_device_code(taskDao.getPoint_code2()); acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDBLXWTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDBLXWTask.java index 99f2637..6ee9fc2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDBLXWTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDBLXWTask.java @@ -54,6 +54,7 @@ public class CPJDBLXWTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -70,6 +71,7 @@ public class CPJDBLXWTask extends AbstractTask { acsTaskDto.setNext_device_code(taskDao.getPoint_code2()); acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDGHJTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDGHJTask.java index f724ccc..34ae18c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDGHJTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDGHJTask.java @@ -54,6 +54,7 @@ public class CPJDGHJTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -70,6 +71,7 @@ public class CPJDGHJTask extends AbstractTask { acsTaskDto.setNext_device_code(taskDao.getPoint_code2()); acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDYHSZTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDYHSZTask.java index 4481e18..656e3ec 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDYHSZTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDYHSZTask.java @@ -54,6 +54,7 @@ public class CPJDYHSZTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -70,6 +71,7 @@ public class CPJDYHSZTask extends AbstractTask { acsTaskDto.setNext_device_code(taskDao.getPoint_code2()); acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDZBJTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDZBJTask.java index 755681a..7331f1d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDZBJTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/CPJDZBJTask.java @@ -54,6 +54,7 @@ public class CPJDZBJTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -70,6 +71,7 @@ public class CPJDZBJTask extends AbstractTask { acsTaskDto.setNext_device_code(taskDao.getPoint_code2()); acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KABDMTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KABDMTask.java index cf20964..0509901 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KABDMTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KABDMTask.java @@ -54,6 +54,7 @@ public class KABDMTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -70,6 +71,7 @@ public class KABDMTask extends AbstractTask { acsTaskDto.setNext_device_code(taskDao.getPoint_code2()); acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KCPJTZPTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KCPJTZPTask.java index 9ecb531..36a614d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KCPJTZPTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KCPJTZPTask.java @@ -54,6 +54,7 @@ public class KCPJTZPTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -76,6 +77,7 @@ public class KCPJTZPTask extends AbstractTask { } acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KDMABTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KDMABTask.java index 6d84558..196459d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KDMABTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KDMABTask.java @@ -54,6 +54,7 @@ public class KDMABTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -71,6 +72,7 @@ public class KDMABTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KTPDZBJTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KTPDZBJTask.java index bb2ae5d..b406766 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KTPDZBJTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KTPDZBJTask.java @@ -54,6 +54,7 @@ public class KTPDZBJTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -70,6 +71,7 @@ public class KTPDZBJTask extends AbstractTask { acsTaskDto.setNext_device_code(taskDao.getPoint_code2()); acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCPJTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCPJTask.java index f3a9a54..ce77cb0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCPJTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCPJTask.java @@ -54,6 +54,7 @@ public class MABCPJTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -70,6 +71,7 @@ public class MABCPJTask extends AbstractTask { acsTaskDto.setNext_device_code(taskDao.getPoint_code2()); acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCTask.java index 46da656..8c2a3c0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCTask.java @@ -54,6 +54,7 @@ public class MABCTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -71,6 +72,7 @@ public class MABCTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABDMTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABDMTask.java index 6b2b1dd..7db643f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABDMTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABDMTask.java @@ -54,6 +54,7 @@ public class MABDMTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -71,6 +72,7 @@ public class MABDMTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABGPTHJTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABGPTHJTask.java index dbb059b..ab5028f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABGPTHJTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABGPTHJTask.java @@ -54,6 +54,7 @@ public class MABGPTHJTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -71,6 +72,7 @@ public class MABGPTHJTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MBZCPTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MBZCPTask.java index e836d8a..f91697e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MBZCPTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MBZCPTask.java @@ -54,6 +54,7 @@ public class MBZCPTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -71,6 +72,7 @@ public class MBZCPTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDMTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDMTask.java index aa25af0..ee5b8bf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDMTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDMTask.java @@ -54,6 +54,7 @@ public class MCDMTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -70,6 +71,7 @@ public class MCDMTask extends AbstractTask { acsTaskDto.setNext_device_code(taskDao.getPoint_code2()); acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDTask.java index 8144832..8a6c095 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDTask.java @@ -54,6 +54,7 @@ public class MCDTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -71,6 +72,7 @@ public class MCDTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDDMTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDDMTask.java index 57891b8..f099465 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDDMTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDDMTask.java @@ -54,6 +54,7 @@ public class MDDMTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -71,6 +72,7 @@ public class MDDMTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCPTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCPTask.java index 38d4729..211f0aa 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCPTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCPTask.java @@ -54,6 +54,7 @@ public class MDMCPTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -71,6 +72,7 @@ public class MDMCPTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCTask.java index ec66512..9c0646f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCTask.java @@ -54,6 +54,7 @@ public class MDMCTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -70,6 +71,7 @@ public class MDMCTask extends AbstractTask { acsTaskDto.setNext_device_code(taskDao.getPoint_code2()); acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJABTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJABTask.java index 652749a..4b1c1d8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJABTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJABTask.java @@ -54,6 +54,7 @@ public class MGPTHJABTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -71,6 +72,7 @@ public class MGPTHJABTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJCPTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJCPTask.java index a9a5669..b314851 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJCPTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJCPTask.java @@ -54,6 +54,7 @@ public class MGPTHJCPTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -71,6 +72,7 @@ public class MGPTHJCPTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MTHCDCPJTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MTHCDCPJTask.java index 796e85a..daa7c82 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MTHCDCPJTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MTHCDCPJTask.java @@ -54,6 +54,7 @@ public class MTHCDCPJTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -70,6 +71,7 @@ public class MTHCDCPJTask extends AbstractTask { acsTaskDto.setNext_device_code(taskDao.getPoint_code2()); acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBLICLPQTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBLICLPQTask.java index de6b005..bfca726 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBLICLPQTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBLICLPQTask.java @@ -54,6 +54,7 @@ public class PUBLICLPQTask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -71,6 +72,7 @@ public class PUBLICLPQTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBMOVETask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBMOVETask.java index 77f2598..fc95251 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBMOVETask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBMOVETask.java @@ -54,6 +54,7 @@ public class PUBMOVETask extends AbstractTask { task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A1"); taskService.save(task); return task.getTask_id(); } @@ -71,6 +72,7 @@ public class PUBMOVETask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("1"); acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/TWOPUBTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/TWOPUBTask.java new file mode 100644 index 0000000..60e0975 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/TWOPUBTask.java @@ -0,0 +1,150 @@ +package org.nl.wms.sch.task_manage.task.tasks.fj; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; +import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.SecurityUtils; +import org.nl.config.IdUtil; +import org.nl.wms.ext.mes.service.WmsToMesService; +import org.nl.wms.sch.task.service.ISchBaseTaskService; +import org.nl.wms.sch.task.service.ISchBaseTaskconfigService; +import org.nl.wms.sch.task.service.dao.SchBaseTask; +import org.nl.wms.sch.task_manage.AbstractTask; +import org.nl.wms.sch.task_manage.AcsTaskDto; +import org.nl.wms.sch.task_manage.GeneralDefinition; +import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum; +import org.nl.wms.sch.task_manage.task.TaskType; +import org.nl.wms.sch.task_manage.task.core.TaskStatus; +import org.nl.wms.util.TaskUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +/** + * @Author: lxy + * @Description: 二期公共任务配置 + * @Date: 2025/7/30 + */ +@Component(value = "TWOPUBTask") +@TaskType("TWOPUBTask") +public class TWOPUBTask extends AbstractTask { + @Autowired + private ISchBaseTaskService taskService; + + @Autowired + private ISchBaseTaskconfigService taskConfigService; + + @Autowired + private WmsToMesService wmsToMesService; + + @Override + public String create(JSONObject json) { + SchBaseTask task = new SchBaseTask(); + task.setTask_id(IdUtil.getStringId()); + task.setTask_code(json.getString("TaskCode")); + task.setTask_status(TaskStatus.CREATE.getCode()); + task.setConfig_code(json.getString("task_type")); + task.setPoint_code1(json.getString("PickingLocation")); + task.setPoint_code2(json.getString("PlacedLocation")); + task.setIs_vehicle(json.getString("IsPanCode")); + task.setExt_group_data(json.getString("CarryIsEmptyTuoPan")); + task.setRequest_param(json.toString()); + task.setPriority(json.getString("Priority")); + task.setCreate_id(SecurityUtils.getCurrentUserId()); + task.setCreate_name(SecurityUtils.getCurrentNickName()); + task.setCreate_time(DateUtil.now()); + task.setWorkshop_code("A2"); + taskService.save(task); + return task.getTask_id(); + } + + @Override + public AcsTaskDto sendAcsParam(String taskId) { + SchBaseTask taskDao = taskService.getById(taskId); + + // 组织下发给acs的数据 + AcsTaskDto acsTaskDto = new AcsTaskDto(); + acsTaskDto.setExt_task_uuid(taskDao.getTask_id()); + acsTaskDto.setTask_code(taskDao.getTask_code()); + acsTaskDto.setStart_device_code(taskDao.getPoint_code1()); + acsTaskDto.setNext_device_code(taskDao.getPoint_code2()); + acsTaskDto.setPriority(taskDao.getPriority()); + acsTaskDto.setTask_type("1"); + acsTaskDto.setDtl_type("2"); + acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); + acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); + + return acsTaskDto; + } + + @Override + protected void updateStatus(String task_code, TaskStatus status) { + // 校验任务 + SchBaseTask taskObj = taskService.getByCode(task_code); + if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) { + throw new BadRequestException("该任务已完成!"); + } + if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) { + throw new BadRequestException("该任务已取消!"); + } + // 根据传来的类型去对任务进行操作 + if (status.equals(TaskStatus.EXECUTING)) { + taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); + taskObj.setRemark("执行中"); + TaskUtils.setUpdateByAcs(taskObj); + taskService.updateById(taskObj); + } + if (status.equals(TaskStatus.FINISHED)) { + this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); + } + if (status.equals(TaskStatus.CANCELED)) { + this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); + } + } + + @Override + public void forceFinish(String task_code) { + SchBaseTask taskObj = taskService.getByCode(task_code); + if (ObjectUtil.isEmpty(taskObj)) { + throw new BadRequestException("该任务不存在"); + } + this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); + } + + @Override + public void cancel(String task_code) { + SchBaseTask taskObj = taskService.getByCode(task_code); + if (ObjectUtil.isEmpty(taskObj)) { + throw new BadRequestException("该任务不存在"); + } + this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); + } + + @Override + public void backMes(String task_code) { + wmsToMesService.receiveTaskStatusMesData(taskService.getByCode(task_code)); + } + + @Transactional(rollbackFor = Exception.class) + public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { + // 任务完成 + taskObj.setTask_status(TaskStatus.FINISHED.getCode()); + taskObj.setRemark(GeneralDefinition.TASK_FINISH); + taskObj.setFinished_type(taskFinishedType.getCode()); + TaskUtils.setUpdateByType(taskObj, taskFinishedType); + taskService.updateById(taskObj); + + // 通知mes任务完成 + wmsToMesService.receiveTaskStatusMesData(taskObj); + } + + @Transactional(rollbackFor = Exception.class) + public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { + taskObj.setRemark(GeneralDefinition.TASK_CANCEL); + taskObj.setTask_status(TaskStatus.CANCELED.getCode()); + taskObj.setFinished_type(taskFinishedType.getCode()); + TaskUtils.setUpdateByType(taskObj, taskFinishedType); + taskService.updateById(taskObj); + } +} diff --git a/lms/nladmin-ui/src/views/wms/basedata/userworkshop/index.vue b/lms/nladmin-ui/src/views/wms/basedata/userworkshop/index.vue new file mode 100644 index 0000000..66d4ff4 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/basedata/userworkshop/index.vue @@ -0,0 +1,322 @@ + + + + + + + diff --git a/lms/nladmin-ui/src/views/wms/basedata/userworkshop/userStor.js b/lms/nladmin-ui/src/views/wms/basedata/userworkshop/userStor.js new file mode 100644 index 0000000..ba4945c --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/basedata/userworkshop/userStor.js @@ -0,0 +1,43 @@ +import request from '@/utils/request' + +export function queryStor(data) { + return request({ + url: '/api/userStor/queryStor', + method: 'post', + data + }) +} + +export function queryUserStor(data) { + return request({ + url: '/api/userStor/queryUserStor', + method: 'post', + data + }) +} + +export function save(data) { + return request({ + url: '/api/userStor/save', + method: 'post', + data + }) +} + +export function getUserStor(data) { + return request({ + url: '/api/userStor/getUserStor', + method: 'post', + data + }) +} + +export function getSect(data) { + return request({ + url: '/api/userStor/getSect', + method: 'post', + data + }) +} + +export default { queryUserStor, queryStor, save, getUserStor, getSect }