diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java index e37c1a7..d0ddfbf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -32,7 +32,7 @@ import org.nl.b_lms.sch.point.dao.mapper.BstIvtPackageinfoivtMapper; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dto.SchBaseTaskDto; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.first_floor_area.ZxqTask; import org.nl.b_lms.sch.tasks.first_floor_area.auto.TaskQueue; import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService; @@ -77,7 +77,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl update(@RequestBody SchBasePoint entity) { schBasePointService.update(entity); return new ResponseEntity<>(HttpStatus.OK); @@ -85,7 +84,6 @@ public class SchBasePointController { * @return 删除结果 */ @Log("删除点位基础表") - //@SaCheckPermission("@el.check(SchBasePoint:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { schBasePointService.deleteAll(ids); @@ -94,7 +92,6 @@ public class SchBasePointController { @PutMapping("/changeActive") @Log("修改点位启用状态") - //@SaCheckPermission("store:edit") public ResponseEntity update(@RequestBody JSONObject json) { schBasePointService.changeActive(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -108,7 +105,6 @@ public class SchBasePointController { @PutMapping("/changeActives") @Log("批量修改点位启用状态") - //@SaCheckPermission("store:edit") public ResponseEntity update2(@RequestBody JSONArray rows) { for (int i = 0; i < rows.size(); i++) { JSONObject json = rows.getJSONObject(i); @@ -117,17 +113,27 @@ public class SchBasePointController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + @Log("启动与禁用") + @PostMapping("/changeUsed") + public ResponseEntity changeUsedOn(@RequestBody JSONObject jsonObject) { + schBasePointService.changeUsed(jsonObject); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("锁定与解锁") + @PostMapping("/changeLock") + public ResponseEntity changeLock(@RequestBody JSONObject jsonObject) { + schBasePointService.changeLock(jsonObject); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } @PostMapping("/getPoint") @Log("查询点位下拉框") - //@SaCheckPermission("materialtype:list") public ResponseEntity queryPoint(@RequestBody List areas) { return new ResponseEntity<>(schBasePointService.getPoint(areas), HttpStatus.OK); } - - @Log("仓位同步") - @PostMapping("/sync") - public ResponseEntity sync() { - schBasePointService.sync(); - return new ResponseEntity<>(HttpStatus.OK); + @GetMapping("/selectPoint") + @Log("查询点位管理") + public ResponseEntity selectPoint(SchBasePointQuery whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(schBasePointService.selectPoint(whereJson, page)), HttpStatus.OK); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.java index 32b3997..1af6843 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.java @@ -53,4 +53,7 @@ public interface SchBasePointMapper extends BaseMapper { IPage selectPageLeftJoin(IPage pages, SchBasePointQuery whereJson); + + + IPage selectPoint(IPage pages, SchBasePointQuery whereJson); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml index 44607df..093dae0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml @@ -178,4 +178,22 @@ AND ( point.point_code like "%" 输入.name "%" or point.point_name like "%" 输入.name "%" ) + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointQuery.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointQuery.java index 897d72d..2b2234d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointQuery.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointQuery.java @@ -15,4 +15,5 @@ public class SchBasePointQuery { private String point_status; private String lock_type; private String is_used; + private String search; } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IschBasePointService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IschBasePointService.java index 5e4a361..8f19f1c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IschBasePointService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IschBasePointService.java @@ -2,6 +2,7 @@ package org.nl.b_lms.sch.point.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; +import java.io.IOException; import java.util.List; import java.util.Map; import java.util.Set; @@ -10,6 +11,9 @@ import org.nl.b_lms.sch.point.dao.SchBasePoint; import org.nl.b_lms.sch.point.dto.SchBasePointQuery; import org.nl.b_lms.sch.region.dao.SchBaseRegion; import org.nl.common.domain.query.PageQuery; +import org.springframework.data.domain.Pageable; + +import javax.servlet.http.HttpServletResponse; public interface IschBasePointService extends IService { @@ -25,6 +29,7 @@ public interface IschBasePointService extends IService { IPage queryAll(SchBasePointQuery whereJson, PageQuery pageable); + SchBasePoint findByCode(String code); /** * 创建 * @@ -47,7 +52,10 @@ public interface IschBasePointService extends IService { */ void deleteAll(Set ids); - + /** + * 获取点位 + */ + IPage selectPoint(SchBasePointQuery whereJson, PageQuery page); /** * 修改点位启用状态 * @param json @@ -57,9 +65,18 @@ public interface IschBasePointService extends IService { List getPoint(List areas); /** - * 仓位同步 + * 改变启用状态 + * + * @param jsonObject */ - void sync(); + void changeUsed(JSONObject jsonObject); + + /** + * 改变锁定类型 + * + * @param jsonObject + */ + void changeLock(JSONObject jsonObject); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java index 7eff48f..5fac5ad 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java @@ -22,7 +22,7 @@ import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.dao.mapper.BstIvtPackageinfoivtMapper; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.domain.query.PageQuery; import org.nl.common.enums.PackageInfoIvtEnum; @@ -61,7 +61,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl lam = new QueryWrapper().lambda(); + lam.eq(SchBasePoint::getIs_delete, "0") + .in(SchBasePoint::getPoint_code, code); + return schBasePointMapper.selectOne(lam); + } /** * 编辑 * @@ -136,13 +149,11 @@ public class SchBasePointServiceImpl extends ServiceImpl lam2 = new LambdaUpdateWrapper<>(); + lam2.set(Structattr::getIs_used,"1".equals(isUsed) ? "0" : "1"); + lam2.set(Structattr::getUpdate_time,DateUtil.now()); + lam2.set(Structattr::getUpdate_name,SecurityUtils.getCurrentNickName()); + lam2.set(Structattr::getUpdate_id,SecurityUtils.getCurrentUserId()); + lam2.eq(Structattr::getStruct_code,structCode); + structattrService.update(null,lam2); } @Override @@ -175,43 +185,12 @@ public class SchBasePointServiceImpl extends ServiceImpl() - .eq(SchBasePoint::getPoint_type, "2")); - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - List structattrDtos = structattrService.getAllPointToShippingSpace(); - List waitAddList = new ArrayList<>(); - for (PointToStructattrDto dto : structattrDtos) { - SchBasePoint point = new SchBasePoint(); - point.setPoint_id(IdUtil.getSnowflake(1,1).nextIdStr()); - point.setPoint_code(dto.getStruct_code()); - point.setPoint_name(dto.getStruct_name()); - point.setRegion_id(String.valueOf(dto.getSect_id())); - point.setRegion_code(dto.getSect_code()); - point.setRegion_name(dto.getSect_name()); - point.setPoint_type("2"); - point.setPoint_status("1"); - point.setLock_type(dto.getLock_type()); - point.setBlock_num(new BigDecimal(dto.getBlock_num())); - point.setRow_num(new BigDecimal(dto.getRow_num())); - point.setCol_num(new BigDecimal(dto.getCol_num())); - point.setLayer_num(new BigDecimal(dto.getLayer_num())); - point.setSource_id(String.valueOf(dto.getStruct_id())); - point.setCreate_id(currentUserId); - point.setCreate_name(nickName); - point.setCreate_time(now); - point.setUpdate_id(currentUserId); - point.setUpdate_name(nickName); - point.setUpdate_time(now); - waitAddList.add(point); - } - this.saveBatch(waitAddList); + public IPage selectPoint(SchBasePointQuery whereJson, PageQuery page) { + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + pages = schBasePointMapper.selectPoint(pages, whereJson); + return pages; } - /** * 获取实体基础信息 * @@ -233,7 +212,50 @@ public class SchBasePointServiceImpl extends ServiceImpl list = new ArrayList<>(); + for (int i = 0; i < data.size(); i++) { + JSONObject object = data.getJSONObject(i); + list.add(object.getString("point_id")); + } + LambdaUpdateWrapper lam = new LambdaUpdateWrapper(); + lam.set(SchBasePoint::getIs_used,used); + lam.in(SchBasePoint::getPoint_id,list); + schBasePointMapper.update(null,lam); + } + /** + * 改变锁定类型 + * + * @param jsonObject + */ + @Override + public void changeLock(JSONObject jsonObject) { + JSONArray data = jsonObject.getJSONArray("data"); + String lock = jsonObject.getString("lock_type"); + List list = new ArrayList<>(); + for (int i = 0; i < data.size(); i++) { + JSONObject object = data.getJSONObject(i); + list.add(object.getString("point_id")); + } + LambdaUpdateWrapper lam = new LambdaUpdateWrapper(); + + if ("1".equals(lock)) { + lam.set(SchBasePoint::getIs_used,"1"); + } else { + lam.set(SchBasePoint::getLock_type,"2"); + } + lam.in(SchBasePoint::getPoint_id,list); + schBasePointMapper.update(null,lam); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/controller/SchBaseRegionController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/controller/RegionController.java similarity index 69% rename from lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/controller/SchBaseRegionController.java rename to lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/controller/RegionController.java index 8364609..65e3ff2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/controller/SchBaseRegionController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/controller/RegionController.java @@ -15,7 +15,7 @@ import org.nl.common.domain.query.PageQuery; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.nl.modules.logging.annotation.Log; -import org.nl.b_lms.sch.region.service.IschBaseRegionService; +import org.nl.b_lms.sch.region.service.RegionService; /** @@ -28,11 +28,11 @@ import org.nl.b_lms.sch.region.service.IschBaseRegionService; @RequiredArgsConstructor @RequestMapping("/api/region") @Slf4j -public class SchBaseRegionController { +public class RegionController { @Resource - private IschBaseRegionService schBaseRegionService; + private RegionService schBaseRegionService; /** @@ -47,6 +47,11 @@ public class SchBaseRegionController { return new ResponseEntity<>(TableDataInfo.build(schBaseRegionService.queryAll(whereJson, page)), HttpStatus.OK); } + @GetMapping("/getRegion") + @Log("获取区域") + public ResponseEntity getRegion() { + return new ResponseEntity<>(schBaseRegionService.list(), HttpStatus.OK); + } /** * 新增数据 @@ -90,7 +95,21 @@ public class SchBaseRegionController { schBaseRegionService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/getPointStatusSelectById") + @Log("获取点位状态下拉框") + //@SaCheckPermission("region:add") + public ResponseEntity getPointStatusSelectById(@RequestBody Long region_id) { + return new ResponseEntity<>(schBaseRegionService.getPointStatusSelectById(region_id), HttpStatus.CREATED); + } + + @PostMapping("/getPointTypeSelectById") + @Log("获取点位类型下拉框") + + //@SaCheckPermission("region:add") + public ResponseEntity getPointTypeSelectById(@RequestBody Long region_id) { + return new ResponseEntity<>(schBaseRegionService.getPointTypeSelectById(region_id), HttpStatus.CREATED); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/dao/SchBaseRegion.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/dao/SchBaseRegion.java index 51f67a8..dd944dc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/dao/SchBaseRegion.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/dao/SchBaseRegion.java @@ -19,8 +19,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; public class SchBaseRegion extends Model { private static final long serialVersionUID = -7739291296662381393L; - - /** * 区域标识 */ diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/service/IschBaseRegionService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/service/RegionService.java similarity index 69% rename from lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/service/IschBaseRegionService.java rename to lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/service/RegionService.java index 2e1fe71..9aae73d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/service/IschBaseRegionService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/service/RegionService.java @@ -1,5 +1,6 @@ package org.nl.b_lms.sch.region.service; +import com.alibaba.fastjson.JSONArray; import org.nl.b_lms.sch.region.dao.SchBaseRegion; import com.baomidou.mybatisplus.extension.service.IService; @@ -16,7 +17,7 @@ import org.nl.common.domain.query.PageQuery; * * @since 2024-01-23 19:45:03 */ -public interface IschBaseRegionService extends IService { +public interface RegionService extends IService { /** @@ -50,7 +51,21 @@ public interface IschBaseRegionService extends IService { * @param ids / */ void deleteAll(Set ids); + /** + * 获取点位状态下拉框 + * + * @param region_id + * @return + */ + JSONArray getPointStatusSelectById(Long region_id); + /** + * 获取点位类型下拉框 + * + * @param region_id + * @return + */ + JSONArray getPointTypeSelectById(Long region_id); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/service/impl/SchBaseRegionServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/service/impl/RegionServiceImpl.java similarity index 67% rename from lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/service/impl/SchBaseRegionServiceImpl.java rename to lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/service/impl/RegionServiceImpl.java index 4d7ce87..5935631 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/service/impl/SchBaseRegionServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/service/impl/RegionServiceImpl.java @@ -3,11 +3,12 @@ package org.nl.b_lms.sch.region.service.impl; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; 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 org.nl.b_lms.sch.region.dao.SchBaseRegion; import org.nl.b_lms.sch.region.dao.mapper.SchBaseRegionMapper; -import org.nl.b_lms.sch.region.service.IschBaseRegionService; +import org.nl.b_lms.sch.region.service.RegionService; import cn.hutool.core.date.DateUtil; import org.nl.common.utils.SecurityUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,6 @@ import org.nl.modules.common.exception.BadRequestException; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; -import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; import java.util.Map; @@ -30,7 +30,7 @@ import java.util.Set; * @since 2024-01-23 19:45:03 */ @Service("schBaseRegionService") -public class SchBaseRegionServiceImpl extends ServiceImpl implements IschBaseRegionService { +public class RegionServiceImpl extends ServiceImpl implements RegionService { @Resource @@ -125,7 +125,59 @@ public class SchBaseRegionServiceImpl extends ServiceImpl { +public interface TaskService extends IService { /** diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/TaskServiceImpl.java similarity index 98% rename from lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java rename to lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/TaskServiceImpl.java index 197a72b..f123cd8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/TaskServiceImpl.java @@ -18,7 +18,7 @@ import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dao.mapper.SchBaseTaskMapper; import org.nl.b_lms.sch.task.dto.SchBaseTaskQuery; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; @@ -47,7 +47,7 @@ import java.util.stream.Collectors; * @since 2024-01-23 16:07:13 */ @Service("taskService") -public class SchBaseTaskServiceImpl extends ServiceImpl implements IschBaseTaskService { +public class TaskServiceImpl extends ServiceImpl implements TaskService { @Autowired diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java index 629b63d..6a2b54e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java @@ -16,7 +16,7 @@ import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.first_floor_area.auto.TaskQueueManager; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; @@ -48,7 +48,7 @@ import java.util.stream.Collectors; @Slf4j public class DjqTask extends AbstractAcsTask { @Resource - private IschBaseTaskService taskService; + private TaskService taskService; @Resource private IbstIvtPackageinfoivtService packageinfoivtService; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java index 94bd624..2588754 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java @@ -14,7 +14,7 @@ import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; @@ -46,7 +46,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask { private final String THIS_CLASS = DjqToKzjhcwTask.class.getName(); @Resource - private IschBaseTaskService taskService; + private TaskService taskService; @Resource private IbstIvtPackageinfoivtService packageinfoivtService; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java index d63cfd1..33cc7c8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java @@ -14,7 +14,7 @@ import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; @@ -44,7 +44,7 @@ public class GzqTask extends AbstractAcsTask { private final String THIS_CLASS = GzqTask.class.getName(); @Resource - private IschBaseTaskService taskService; + private TaskService taskService; @Resource private IbstIvtPackageinfoivtService packageinfoivtService; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java index 72c3870..186c23c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java @@ -14,7 +14,7 @@ import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; @@ -46,7 +46,7 @@ public class GzqToKzjhcwTask extends AbstractAcsTask { private final String THIS_CLASS = GzqToKzjhcwTask.class.getName(); @Resource - private IschBaseTaskService taskService; + private TaskService taskService; @Resource private IbstIvtPackageinfoivtService packageinfoivtService; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java index d02baf8..77b35ed 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java @@ -17,7 +17,7 @@ import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.ContainerLevelEnum; import org.nl.common.enums.PackageInfoIvtEnum; @@ -54,7 +54,7 @@ public class MzhcwTask extends AbstractAcsTask { private final String THIS_CLASS = MzhcwTask.class.getName(); @Resource - private IschBaseTaskService taskService; + private TaskService taskService; @Resource private IPdmBiSlittingproductionplanService productionPlanService; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java index f92535d..8d58675 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java @@ -14,7 +14,7 @@ import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; @@ -42,7 +42,7 @@ import java.util.List; @Slf4j public class SendDjqKzjTask extends AbstractAcsTask { @Resource - private IschBaseTaskService taskService; + private TaskService taskService; @Resource private IbstIvtPackageinfoivtService packageinfoivtService; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java index 548a92d..91b8ecd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java @@ -14,7 +14,7 @@ import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; @@ -42,7 +42,7 @@ import java.util.List; @Slf4j public class SendGzqKzjTask extends AbstractAcsTask { @Resource - private IschBaseTaskService taskService; + private TaskService taskService; @Resource private IbstIvtPackageinfoivtService packageinfoivtService; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java index e558666..931f9e6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java @@ -13,7 +13,7 @@ import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; @@ -44,7 +44,7 @@ public class SsxDjwTask extends AbstractAcsTask { private final String THIS_CLASS = SsxDjwTask.class.getName(); @Resource - private IschBaseTaskService taskService; + private TaskService taskService; @Resource diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java index 6f4986f..9f7712f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java @@ -18,7 +18,7 @@ import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.first_floor_area.auto.AutoSendVehicleToDjq; import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper; @@ -65,7 +65,7 @@ public class ZxDjwTask extends AbstractAcsTask { @Resource private IpdmBiSubpackagerelationService subpackageRelationService; @Resource - private IschBaseTaskService taskService; + private TaskService taskService; @Resource private IbstIvtPackageinfoivtService packageinfoivtService; @Resource diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java index f19d450..7b492f0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java @@ -19,7 +19,7 @@ import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; @@ -56,7 +56,7 @@ public class ZxqTask extends AbstractAcsTask { @Resource - private IschBaseTaskService taskService; + private TaskService taskService; @Resource private IbstIvtPackageinfoivtService packageinfoivtService; @Resource diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java index dfe48fe..dce72fb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java @@ -10,7 +10,7 @@ import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.first_floor_area.MzhcwTask; import org.nl.b_lms.sch.tasks.first_floor_area.SsxDjwTask; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; @@ -44,7 +44,7 @@ public class AutoExecuteWaitTask { @Resource private SsxDjwTask ssxDjwTask; @Resource - private IschBaseTaskService taskService; + private TaskService taskService; @Resource private IbstIvtPackageinfoivtService packageinfoivtService; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java index 0e4559e..0e462b1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java @@ -8,7 +8,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.first_floor_area.DjqTask; import org.nl.common.enums.PackageInfoIvtEnum; import org.redisson.api.RLock; @@ -29,7 +29,7 @@ import java.util.stream.Collectors; public class AutoSendMzToDjq { @Resource - private IschBaseTaskService taskService; + private TaskService taskService; private final String THIS_CLASS = AutoSendMzToDjq.class.getName(); @Resource private RedissonClient redissonClient; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java index 1580f2d..eb54d3f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java @@ -10,7 +10,7 @@ import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationServi import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.first_floor_area.SendDjqKzjTask; import org.nl.b_lms.sch.tasks.first_floor_area.SendGzqKzjTask; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; @@ -32,7 +32,7 @@ import java.util.stream.Collectors; public class AutoSendVehicleToDjq { private final String THIS_CLASS = AutoSendVehicleToDjq.class.getName(); @Resource - private IschBaseTaskService taskService; + private TaskService taskService; @Resource private RedissonClient redissonClient; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java index 7a7f8db..a30792b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java @@ -9,7 +9,7 @@ import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.first_floor_area.DjqToKzjhcwTask; import org.nl.b_lms.sch.tasks.first_floor_area.GzqToKzjhcwTask; import org.nl.common.enums.PackageInfoIvtEnum; @@ -42,7 +42,7 @@ public class AutoSendVehicleToKzj { private IbstIvtPackageinfoivtService packageinfoivtService; @Resource - private IschBaseTaskService taskService; + private TaskService taskService; //待检区或管制区->空载具缓存位补空 public void run() { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java index 277a4b6..4db2e73 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java @@ -19,7 +19,7 @@ import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationServi import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.first_floor_area.ZxDjwTask; import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper; @@ -57,7 +57,7 @@ public class AutoSendZxToDjw { @Resource private RedisUtils redisUtils; @Resource - private IschBaseTaskService taskService; + private TaskService taskService; @Resource private ZxDjwTask zxDjwTask; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java index 84a2177..dc7447f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java @@ -1,10 +1,9 @@ package org.nl.b_lms.sch.tasks.first_floor_area.auto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.b_lms.pdm.subpackagerelation.dao.mapper.PdmBiSubpackagerelationMapper; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dto.SchBaseTaskDto; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.first_floor_area.ZxqTask; import org.nl.modules.common.utils.RedisUtils; import org.nl.wms.sch.manage.TaskStatusEnum; @@ -20,7 +19,7 @@ import java.util.Map; public class TaskQueue { @Resource - private IschBaseTaskService taskService; + private TaskService taskService; @Resource private ZxqTask zxqTask; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueueManager.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueueManager.java index d1f3656..2caf3ca 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueueManager.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueueManager.java @@ -2,7 +2,7 @@ package org.nl.b_lms.sch.tasks.first_floor_area.auto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.first_floor_area.ZxqTask; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -14,7 +14,7 @@ import java.util.*; public class TaskQueueManager { @Resource - private IschBaseTaskService taskService; + private TaskService taskService; private final Map> taskGroupQueues; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/MoveVehicleAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/MoveVehicleAgvTask.java index 62d70f2..e8d7b00 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/MoveVehicleAgvTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/MoveVehicleAgvTask.java @@ -2,22 +2,16 @@ package org.nl.b_lms.sch.tasks.slitter; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService; -import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService; -import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.TaskUtils; -import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; @@ -28,8 +22,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @Author: lyd @@ -41,7 +33,7 @@ import java.util.stream.Stream; public class MoveVehicleAgvTask extends AbstractAcsTask { private final String THIS_CLASS = MoveVehicleAgvTask.class.getName(); @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private IPdmBiSlittingproductionplanService slittingproductionplanService; @Autowired diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendAirShaftAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendAirShaftAgvTask.java index d591095..84e0880 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendAirShaftAgvTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendAirShaftAgvTask.java @@ -12,7 +12,7 @@ import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; @@ -41,7 +41,7 @@ import java.util.stream.Stream; public class SendAirShaftAgvTask extends AbstractAcsTask { private final String THIS_CLASS = SendAirShaftAgvTask.class.getName(); @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private IPdmBiSlittingproductionplanService slittingproductionplanService; @Autowired diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendCopperFoilSubRollTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendCopperFoilSubRollTrussTask.java index 9f69b13..1279bd6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendCopperFoilSubRollTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendCopperFoilSubRollTrussTask.java @@ -10,7 +10,7 @@ import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService; import org.nl.b_lms.bst.ivt.shafttubeivt.service.IBstIvtShafttubeivtService; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.TaskUtils; @@ -37,7 +37,7 @@ import java.util.List; public class SendCopperFoilSubRollTrussTask extends AbstractAcsTask { private final String THIS_CLASS = SendCopperFoilSubRollTrussTask.class.getName(); @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private IPdmBiSlittingproductionplanService slittingproductionplanService; @Autowired diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendNBJExceptionPointTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendNBJExceptionPointTask.java index bc7141c..f6547fc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendNBJExceptionPointTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendNBJExceptionPointTask.java @@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService; import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; @@ -35,7 +35,7 @@ import java.util.List; public class SendNBJExceptionPointTask extends AbstractAcsTask { private final String THIS_CLASS = SendNBJExceptionPointTask.class.getName(); @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private IBstIvtCutpointivtService bcutpointivtService; @Override diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownAgvTask.java index e2cda5b..32532d9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownAgvTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownAgvTask.java @@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService; import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.TaskUtils; @@ -36,7 +36,7 @@ import java.util.List; public class SlitterDownAgvTask extends AbstractAcsTask { private final String THIS_CLASS = SlitterDownAgvTask.class.getName(); @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private IBstIvtCutpointivtService bcutpointivtService; @Override diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java index 772a587..2fb949d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java @@ -14,7 +14,7 @@ import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingprodu import org.nl.b_lms.sch.point.dao.StIvtCutpointivt; import org.nl.b_lms.sch.point.service.IstIvtCutpointivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.TaskUtils; @@ -42,7 +42,7 @@ import java.util.stream.Stream; public class SlitterDownTrussTask extends AbstractAcsTask { private final String THIS_CLASS = SlitterDownTrussTask.class.getName(); @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private IPdmBiSlittingproductionplanService slittingproductionplanService; @Autowired diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaCallTubeTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaCallTubeTask.java index af17ec2..65471c5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaCallTubeTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaCallTubeTask.java @@ -5,15 +5,12 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.bst.ivt.papervehicle.service.IMdPbPapervehicleService; -import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle; import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService; import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; -import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.TaskUtils; @@ -27,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -41,7 +37,7 @@ import java.util.List; public class StockAreaCallTubeTask extends AbstractAcsTask { private final String THIS_CLASS = StockAreaCallTubeTask.class.getName(); @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private IBstIvtStockingivtService stockingivtService; @Autowired diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaSendVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaSendVehicleTask.java index 6cd7a34..0a1720c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaSendVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaSendVehicleTask.java @@ -12,7 +12,7 @@ import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle; import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService; import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterEnum; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; @@ -43,7 +43,7 @@ import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.doSavePaperInf public class StockAreaSendVehicleTask extends AbstractAcsTask { private final String THIS_CLASS = StockAreaSendVehicleTask.class.getName(); @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private IBstIvtStockingivtService stockingivtService; @Autowired diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java index c8dcfd9..570902c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java @@ -5,22 +5,18 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService; import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; import org.nl.b_lms.bst.ivt.shafttubeivt.service.IBstIvtShafttubeivtService; -import org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; -import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.TaskUtils; @@ -47,7 +43,7 @@ import java.util.List; public class TrussCallAirShaftTask extends AbstractAcsTask { private final String THIS_CLASS = TrussCallAirShaftTask.class.getName(); @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private IPdmBiSlittingproductionplanService slittingproductionplanService; @Autowired diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallShaftCacheTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallShaftCacheTask.java index c7574f0..5e8b4ba 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallShaftCacheTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallShaftCacheTask.java @@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.bst.ivt.shafttubeivt.service.IBstIvtShafttubeivtService; import org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.TaskUtils; @@ -35,7 +35,7 @@ import java.util.List; public class TrussCallShaftCacheTask extends AbstractAcsTask { private final String THIS_CLASS = TrussCallShaftCacheTask.class.getName(); @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private IBstIvtShafttubeivtService shafttubeivtService; @Override diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussSendAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussSendAirShaftTask.java index 60cfcc5..0e76dd8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussSendAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussSendAirShaftTask.java @@ -14,7 +14,7 @@ import org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.TaskUtils; @@ -42,7 +42,7 @@ import java.util.stream.Stream; public class TrussSendAirShaftTask extends AbstractAcsTask { private final String THIS_CLASS = TrussSendAirShaftTask.class.getName(); @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private IPdmBiSlittingproductionplanService slittingproductionplanService; @Autowired diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussSendShaftCacheTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussSendShaftCacheTask.java index 8d6baec..82a04c5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussSendShaftCacheTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussSendShaftCacheTask.java @@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.bst.ivt.shafttubeivt.service.IBstIvtShafttubeivtService; import org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.TaskUtils; @@ -35,7 +35,7 @@ import java.util.List; class TrussSendShaftCacheTask extends AbstractAcsTask { private final String THIS_CLASS = TrussSendShaftCacheTask.class.getName(); @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private IBstIvtShafttubeivtService shafttubeivtService; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussTask.java index b7d1fef..d0b6499 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussTask.java @@ -14,7 +14,7 @@ import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingprodu import org.nl.b_lms.sch.point.dao.StIvtCutpointivt; import org.nl.b_lms.sch.point.service.IstIvtCutpointivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.TaskUtils; @@ -43,7 +43,7 @@ public class UpShaftTrussTask extends AbstractAcsTask { private final String THIS_CLASS = UpShaftTrussTask.class.getName(); @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private IPdmBiSlittingproductionplanService slittingproductionplanService; @Autowired diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java index f902193..f2ec057 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java @@ -16,7 +16,7 @@ import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.slitter.StockAreaCallTubeTask; import org.nl.b_lms.sch.tasks.slitter.StockAreaSendVehicleTask; import org.nl.b_lms.sch.tasks.slitter.TrussCallAirShaftTask; @@ -77,7 +77,7 @@ public class AutoCallAirShaftTask { @Autowired private IMdPbPapervehicleService mdPbPapervehicleService; @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private ISysParamService paramService; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSlitterDownAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSlitterDownAgvTask.java index 022d0c0..da3b88b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSlitterDownAgvTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSlitterDownAgvTask.java @@ -1,12 +1,10 @@ package org.nl.b_lms.sch.tasks.slitter.auto; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService; import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; -import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.slitter.SlitterDownAgvTask; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterEnum; @@ -19,8 +17,6 @@ import org.springframework.stereotype.Component; import java.util.List; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @Author: lyd @@ -41,7 +37,7 @@ public class AutoSlitterDownAgvTask { @Autowired private SlitterDownAgvTask slitterDownAgvTask; @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private SlitterMapper slitterMapper; @Autowired diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java index 2c21e8b..8574ba9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java @@ -10,7 +10,7 @@ import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingprodu import org.nl.b_lms.sch.point.dao.StIvtCutpointivt; import org.nl.b_lms.sch.point.service.IstIvtCutpointivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.slitter.UpShaftTrussTask; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterEnum; @@ -38,7 +38,7 @@ public class AutoUpShaftTrussTask { @Autowired private UpShaftTrussTask upShaftTrussTask; @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private SlitterMapper slitterMapper; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index 0f6f30d..99eb9df 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -33,7 +33,7 @@ import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationServi import org.nl.b_lms.sch.point.dao.StIvtCutpointivt; import org.nl.b_lms.sch.point.service.IstIvtCutpointivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.task.service.TaskService; import org.nl.b_lms.sch.tasks.slitter.*; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterEnum; @@ -75,7 +75,7 @@ import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.getPointLocati public class SlitterServiceImpl implements SlitterService { @Autowired - private IschBaseTaskService taskService; + private TaskService taskService; @Autowired private IPdmBiSlittingproductionplanService slittingproductionplanService; @Autowired diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java index 02db9e6..9f84575 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java @@ -18,6 +18,8 @@ import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation; import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService; import org.nl.b_lms.pdm_manage.enums.SUBEnum; +import org.nl.b_lms.sch.point.dao.SchBasePoint; +import org.nl.b_lms.sch.point.service.IschBasePointService; import org.nl.b_lms.sch.tasks.TwoInTask; import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService; import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; @@ -46,13 +48,10 @@ import org.nl.wms.basedata.st.sectattr.service.dao.mapper.SectattrMapper; import org.nl.wms.basedata.st.storattr.service.StorattrService; import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto; import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; -import org.nl.wms.basedata.st.structattr.service.StructattrService; import org.nl.wms.basedata.st.structattr.service.dao.Structattr; import org.nl.wms.basedata.st.structattr.service.dao.mapper.StructattrMapper; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.service.PointService; -import org.nl.wms.sch.service.dto.PointDto; import org.nl.wms.st.inbill.service.StorPublicService; import org.nl.wms.st.returns.service.impl.InAndOutRetrunServiceImpl; import org.redisson.api.RLock; @@ -85,8 +84,6 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(pointService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增点位") - - //@SaCheckPermission("point:add") - public ResponseEntity create(@Validated @RequestBody PointDto dto) { - pointService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改点位") - - //@SaCheckPermission("point:edit") - public ResponseEntity update(@Validated @RequestBody PointDto dto) { - pointService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除点位") - - //@SaCheckPermission("point:del") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - pointService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @Log("导出数据") - - @GetMapping(value = "/download") - public void download(@RequestParam Map map, HttpServletResponse response) throws IOException { - pointService.download(map, response); - } - - @PutMapping("/changeActive") - @Log("修改点位启用状态") - - //@SaCheckPermission("store:edit") - public ResponseEntity update(@RequestBody JSONObject json) { - pointService.changeActive(json); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @PutMapping("/changeActives") - @Log("批量修改点位启用状态") - - //@SaCheckPermission("store:edit") - public ResponseEntity update2(@RequestBody JSONArray rows) { - for (int i = 0; i < rows.size(); i++) { - JSONObject json = rows.getJSONObject(i); - pointService.changeActive(json); - } - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @PostMapping("/getPoint") - @Log("查询点位下拉框") - - //@SaCheckPermission("materialtype:list") - public ResponseEntity queryPoint(@RequestBody Map whereJson) { - return new ResponseEntity<>(pointService.getPoint(whereJson), HttpStatus.OK); - } - - @GetMapping("/selectPoint") - @Log("查询点位管理") - - //@SaCheckPermission("Point:list") - public ResponseEntity selectPoint(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(pointService.selectPoint(whereJson, page), HttpStatus.OK); - } - - @GetMapping("/getRegion") - @Log("获取区域") - public ResponseEntity getRegion() { - return new ResponseEntity<>(pointService.getRegion(), HttpStatus.OK); - } - - @Log("启动与禁用") - @PostMapping("/changeUsed") - - public ResponseEntity changeUsedOn(@RequestBody JSONObject jsonObject) { - pointService.changeUsed(jsonObject); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("锁定与解锁") - @PostMapping("/changeLock") - - public ResponseEntity changeLock(@RequestBody JSONObject jsonObject) { - pointService.changeLock(jsonObject); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("仓位同步") - @PostMapping("/sync") - - public ResponseEntity sync() { - pointService.sync(); - return new ResponseEntity<>(HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/RegionController.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/RegionController.java deleted file mode 100644 index 63fecbe..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/RegionController.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.nl.wms.sch.rest; - - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.logging.annotation.Log; -import org.nl.wms.sch.service.RegionService; -import org.nl.wms.sch.service.dto.RegionDto; -import org.springframework.data.domain.Pageable; -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; - -/** - * @author Liuxy - * @date 2022-08-11 - **/ -@RestController -@RequiredArgsConstructor - -@RequestMapping("/api/region2") -@Slf4j -public class RegionController { - - private final RegionService regionService; - - @GetMapping - @Log("查询区域管理") - - //@SaCheckPermission("region:list") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(regionService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增区域管理") - - //@SaCheckPermission("region:add") - public ResponseEntity create(@Validated @RequestBody RegionDto dto) { - regionService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改区域管理") - - //@SaCheckPermission("region:edit") - public ResponseEntity update(@Validated @RequestBody RegionDto dto) { - regionService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除区域管理") - - //@SaCheckPermission("region:del") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - regionService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PostMapping("/getPointStatusSelectById") - @Log("获取点位状态下拉框") - - //@SaCheckPermission("region:add") - public ResponseEntity getPointStatusSelectById(@RequestBody Long region_id) { - return new ResponseEntity<>(regionService.getPointStatusSelectById(region_id), HttpStatus.CREATED); - } - - @PostMapping("/getPointTypeSelectById") - @Log("获取点位类型下拉框") - - //@SaCheckPermission("region:add") - public ResponseEntity getPointTypeSelectById(@RequestBody Long region_id) { - return new ResponseEntity<>(regionService.getPointTypeSelectById(region_id), HttpStatus.CREATED); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java deleted file mode 100644 index a53a780..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.nl.wms.sch.rest; - - -import cn.dev33.satoken.annotation.SaIgnore; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.logging.annotation.Log; -import org.nl.wms.sch.manage.FinishTypeEnum; -import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.service.TaskService; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** - * @author ldjun - * @date 2021-08-19 - **/ -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/task2") -@Slf4j -public class TaskController { - - private final TaskService taskService; - - @GetMapping - @Log("查询任务") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(taskService.queryAll(whereJson, page), HttpStatus.OK); - } - - @GetMapping("/taskStatus") - @Log("获取任务状态列表") - public ResponseEntity getTaskStatus() { - TaskStatusEnum[] values = TaskStatusEnum.values(); - JSONArray arr = new JSONArray(); - for (TaskStatusEnum value : values) { - JSONObject json = new JSONObject(); - json.put("code", value.getCode()); - json.put("name", value.getName()); - arr.add(json); - } - //增加未完成状态 - JSONObject unFinish = new JSONObject(); - unFinish.put("code", "-1"); - unFinish.put("name", "未完成"); - arr.add(unFinish); - return new ResponseEntity<>(arr, HttpStatus.OK); - } - - @GetMapping("/finishType") - @Log("获取任务类型列表") - public ResponseEntity getFinishType() { - FinishTypeEnum[] values = FinishTypeEnum.values(); - JSONArray arr = new JSONArray(); - for (FinishTypeEnum value : values) { - JSONObject json = new JSONObject(); - json.put("code", value.getCode()); - json.put("name", value.getName()); - arr.add(json); - } - return new ResponseEntity<>(arr, HttpStatus.OK); - } - - @PutMapping("/operation") - @Log("任务操作") - @SaIgnore - public ResponseEntity update(@RequestBody Map map) { - taskService.operation(map); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java deleted file mode 100644 index a049952..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java +++ /dev/null @@ -1,114 +0,0 @@ -package org.nl.wms.sch.service; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.sch.service.dto.PointDto; -import org.springframework.data.domain.Pageable; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.List; -import java.util.Map; - -/** - * @author ldjun - * @description 服务接口 - * @date 2021-12-07 - **/ -public interface PointService { - - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * - * @param point_id ID - * @return Point - */ - PointDto findById(Long point_id); - - /** - * 根据编码查询 - * - * @param code code - * @return Point - */ - PointDto findByCode(String code); - - - /** - * 创建 - * - * @param dto / - */ - void create(PointDto dto); - - /** - * 编辑 - * - * @param dto / - */ - void update(PointDto dto); - - /** - * 多选删除 - * - * @param ids / - */ - void deleteAll(Long[] ids); - - /** - * 编辑 - * - * @param json / - */ - void changeActive(JSONObject json); - - JSONArray getPoint(Map wherJson); - - /** - * 获取点位 - */ - Map selectPoint(Map whereJson, Pageable page); - - /** - * 获取区域 - */ - JSONArray getRegion(); - - /** - * 改变启用状态 - * - * @param jsonObject - */ - void changeUsed(JSONObject jsonObject); - - /** - * 改变锁定类型 - * - * @param jsonObject - */ - void changeLock(JSONObject jsonObject); - - /** - * 仓位同步 - */ - void sync(); - - void download(Map map, HttpServletResponse response) throws IOException; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/RegionService.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/RegionService.java deleted file mode 100644 index 1da65aa..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/RegionService.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.nl.wms.sch.service; - -import com.alibaba.fastjson.JSONArray; -import org.nl.wms.sch.service.dto.RegionDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** - * @author Liuxy - * @description 服务接口 - * @date 2022-08-11 - **/ -public interface RegionService { - - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * - * @param region_id ID - * @return Region - */ - RegionDto findById(Long region_id); - - /** - * 根据编码查询 - * - * @param code code - * @return Region - */ - RegionDto findByCode(String code); - - - /** - * 创建 - * - * @param dto / - */ - void create(RegionDto dto); - - /** - * 编辑 - * - * @param dto / - */ - void update(RegionDto dto); - - /** - * 多选删除 - * - * @param ids / - */ - void deleteAll(Long[] ids); - - /** - * 获取点位状态下拉框 - * - * @param region_id - * @return - */ - JSONArray getPointStatusSelectById(Long region_id); - - /** - * 获取点位类型下拉框 - * - * @param region_id - * @return - */ - JSONArray getPointTypeSelectById(Long region_id); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java deleted file mode 100644 index 5938002..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.nl.wms.sch.service; - -import org.springframework.data.domain.Pageable; - -import java.util.Map; - -/** - * @author ldjun - * @description 服务接口 - * @date 2021-08-19 - **/ -public interface TaskService { - - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 任务操作 - * - * @param param - */ - void operation(Map param); - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java deleted file mode 100644 index f744106..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java +++ /dev/null @@ -1,184 +0,0 @@ -package org.nl.wms.sch.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @author 1 - * @description / - * @date 2022-10-19 - **/ -@Data -public class PointDto implements Serializable { - - /** 点位标识 */ - /** - * 防止精度丢失 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long point_id; - - /** - * 点位编码 - */ - private String point_code; - - /** - * 点位名称 - */ - private String point_name; - - /** - * 所属区域 - */ - private Long region_id; - - /** - * 区域编码 - */ - private String region_code; - - /** - * 区域名称 - */ - private String region_name; - - /** - * 点位类型 - */ - private String point_type; - - /** - * 点位状态 - */ - private String point_status; - - /** - * 锁定类型 - */ - private String lock_type; - - /** - * 设备编码 - */ - private String device_code; - - /** - * MES设备编码 - */ - private String mes_device_code; - - /** - * 物料标识 - */ - private Long material_id; - - /** - * 允许的载具类型 - */ - private String can_vehicle_type; - - /** - * 载具类型 - */ - private String vehicle_type; - - /** - * 载具编码 - */ - private String vehicle_code; - - /** - * 载具编码 - */ - private String material_code; - - /** - * 载具数量 - */ - private BigDecimal vehicle_qty; - - /** - * 块 - */ - private BigDecimal block_num; - - /** - * 排 - */ - private BigDecimal row_num; - - /** - * 列 - */ - private BigDecimal col_num; - - /** - * 层 - */ - private BigDecimal layer_num; - - /** - * 点位组编码 - */ - private String point_group_code; - - /** - * 是否建工单 - */ - private String is_have_workder; - - /** - * 备注 - */ - private String remark; - - /** - * 来源标识 - */ - private Long source_id; - - /** - * 是否启用 - */ - private String is_used; - - /** - * 是否删除 - */ - private String is_delete; - - /** - * 创建人 - */ - private String create_id; - - /** - * 创建人 - */ - private String create_name; - - /** - * 创建时间 - */ - private String create_time; - - /** - * 修改人 - */ - private String update_optid; - - /** - * 修改人 - */ - private String update_optname; - - /** - * 修改时间 - */ - private String update_time; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/RegionDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/RegionDto.java deleted file mode 100644 index 0bb68ea..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/RegionDto.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.nl.wms.sch.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.io.Serializable; - -/** - * @author Liuxy - * @description / - * @date 2022-08-11 - **/ -@Data -public class RegionDto implements Serializable { - - /** 区域标识 */ - /** - * 防止精度丢失 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long region_id; - - /** - * 区域编码 - */ - private String region_code; - - /** - * 区域名称 - */ - private String region_name; - - /** - * 点位类型备注 - */ - private String point_type_explain; - - /** - * 点位状态备注 - */ - private String point_status_explain; - - /** - * 备注 - */ - private String remark; - - /** - * 创建人 - */ - private String create_id; - - /** - * 创建人姓名 - */ - private String create_name; - - /** - * 创建时间 - */ - private String create_time; - - /** - * 修改人 - */ - private String update_optid; - - /** - * 修改人姓名 - */ - private String update_optname; - - /** - * 修改时间 - */ - private String update_time; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/TaskDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/TaskDto.java deleted file mode 100644 index 015340f..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/TaskDto.java +++ /dev/null @@ -1,154 +0,0 @@ -package org.nl.wms.sch.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @author ldjun - * @description / - * @date 2022-10-19 - **/ -@Data -public class TaskDto implements Serializable { - - /** 任务标识 */ - /** - * 防止精度丢失 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long task_id; - - /** - * 任务编码 - */ - private String task_code; - - /** - * 任务类型 - */ - private String task_type; - - /** - * 任务状态 - */ - private String task_status; - - /** - * 点位1 - */ - private String point_code1; - - /** - * 点位2 - */ - private String point_code2; - - /** - * 点位3 - */ - private String point_code3; - - /** - * 点位4 - */ - private String point_code4; - - /** - * 物料标识 - */ - private Long material_id; - - /** - * 载具类型 - */ - private String vehicle_type; - - /** - * 载具数量 - */ - private BigDecimal vehicle_qty; - - /** - * 载具编码 - */ - private String vehicle_code; - - /** - * 优先级 - */ - private String priority; - - /** - * 处理类 - */ - private String handle_class; - - /** - * 任务组标识 - */ - private Long task_group_id; - - /** - * 任务顺序号 - */ - private BigDecimal sort_seq; - - /** - * 任务完成类型 - */ - private String finished_type; - - /** - * acs任务类型 - */ - private String acs_task_type; - - /** - * 业务表表名 - */ - private String table_name; - - /** - * 业务表表名主键字段 - */ - private String table_fk; - - /** - * 业务表表名主键值 - */ - private Long table_fk_id; - - /** - * 备注 - */ - private String remark; - - /** - * 备注1 - */ - private String remark2; - - /** - * 备注2 - */ - private String remark3; - - /** - * 是否删除 - */ - private String is_delete; - - /** - * 创建时间 - */ - private String create_time; - - /** - * 修改时间 - */ - private String update_time; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java deleted file mode 100644 index e7586bb..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ /dev/null @@ -1,441 +0,0 @@ -package org.nl.wms.sch.service.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.utils.SecurityUtils; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.FileUtil; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr; -import org.nl.wms.basedata.st.sectattr.service.dao.mapper.SectattrMapper; -import org.nl.wms.basedata.st.structattr.service.StructattrService; -import org.nl.wms.basedata.st.structattr.service.dao.Structattr; -import org.nl.wms.sch.service.PointService; -import org.nl.wms.sch.service.RegionService; -import org.nl.wms.sch.service.dto.PointDto; -import org.nl.wms.sch.service.dto.RegionDto; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.*; - -/** - * @author ldjun - * @description 服务实现 - * @date 2021-08-19 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class PointServiceImpl implements PointService { - - private final RegionService regionService; - @Autowired - private SectattrMapper sectattrMapper; - @Autowired - private StructattrService structattrService; - @Override - public Map queryAll(Map whereJson, Pageable page) { - HashMap map = new HashMap(); - map.put("flag", "1"); - map.put("region_id", whereJson.get("region_id")); - map.put("ids", whereJson.get("ids")); - map.put("lock_type", whereJson.get("lock_type")); - map.put("point_status", whereJson.get("point_status")); - map.put("is_used", whereJson.get("is_used")); - map.put("point_type", whereJson.get("point_type")); - Object name = whereJson.get("name"); - if (ObjectUtil.isNotEmpty(name)) { - String search = (String) name; - String[] split = search.split("_"); - name = String.join("\\_", split); - map.put("name", name); - } - JSONObject json = WQL.getWO("QSCH_BASE_POINT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "point_code asc"); - JSONArray content = json.getJSONArray("content"); - JSONArray res = new JSONArray(); - for (int i = 0; i < content.size(); i++) { - JSONObject object = content.getJSONObject(i); - Long region_id = object.getLong("region_id"); - String point_status = object.getString("point_status"); - String point_type = object.getString("point_type"); - RegionDto regionDto = regionService.findById(region_id); - String point_status_explain = regionDto.getPoint_status_explain(); - String point_type_explain = regionDto.getPoint_type_explain(); - // 获取点位状态名称 - if (!ObjectUtil.isEmpty(point_status)) { - JSONObject statusArr = new JSONObject(); - String[] split = point_status_explain.split("，"); - for (int j = 0; j < split.length; j++) { - String[] status = split[j].split("-"); - statusArr.put(status[0], status[1]); - } - object.put("point_status_name", statusArr.getString(point_status)); - } - // 获取点位类型 - if (!ObjectUtil.isEmpty(point_type)) { - JSONObject typeArr = new JSONObject(); - String[] split = point_type_explain.split("，"); - for (int j = 0; j < split.length; j++) { - String[] types = split[j].split("-"); - typeArr.put(types[0], types[1]); - } - object.put("point_type_name", typeArr.getString(point_type)); - } - res.add(object); - } - json.put("content", res); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("sch_base_point"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(PointDto.class); - return list; - } - - @Override - public PointDto findById(Long point_id) { - WQLObject wo = WQLObject.getWQLObject("sch_base_point"); - JSONObject json = wo.query("point_id =" + point_id + "").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(PointDto.class); - } - final PointDto obj = json.toJavaObject(PointDto.class); - return obj; - } - - - @Override - public PointDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("sch_base_point"); - JSONObject json = wo.query("point_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(PointDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(PointDto dto) { - String point_code = dto.getPoint_code(); - PointDto byCode = this.findByCode(point_code); - if (ObjectUtil.isNotEmpty(byCode)) { - throw new BadRequestException("存在相同的点位编码"); - } - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - RegionDto regionDto = regionService.findById(dto.getRegion_id()); - dto.setRegion_code(regionDto.getRegion_code()); - dto.setRegion_name(regionDto.getRegion_name()); - dto.setPoint_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("sch_base_point"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(PointDto dto) { - PointDto entity = this.findById(dto.getPoint_id()); - if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); - } - - String pointStatus = dto.getPoint_status(); - if (ObjectUtil.isNotEmpty(pointStatus) && "1".equals(pointStatus)) { - entity.setMaterial_id(null); - entity.setVehicle_type(null); - entity.setVehicle_code(null); - entity.setVehicle_qty(null); - } - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - Long region_id = dto.getRegion_id(); - JSONObject region = WQLObject.getWQLObject("sch_base_region").query("region_id = '" + region_id + "'").uniqueResult(0); - dto.setRegion_code(region.getString("region_code")); - dto.setRegion_name(region.getString("region_name")); - - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - - WQLObject wo = WQLObject.getWQLObject("sch_base_point"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("sch_base_point"); - for (Long point_id : ids) { - JSONObject param = new JSONObject(); - param.put("point_id", String.valueOf(point_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void changeActive(JSONObject json) { - - //如果是仓位点位，更新状态前，先去查询仓位点位所对应的库区是否启用，如果禁用抛出异常 - String struct_code = json.getString("point_code"); - String point_type = json.getString("point_type"); - if ("01".equals(point_type)) { - Structattr structAttr = structattrService.findByCode(struct_code); - - if (ObjectUtil.isNotEmpty(structAttr)) { - String sect_id = String.valueOf(structAttr.getSect_id()); - Sectattr sectAttr = sectattrMapper.selectById(sect_id); - if (ObjectUtil.isEmpty(sectAttr)) { - throw new BadRequestException("启用失败，请检查仓位点位所属库区是否启用!"); - } - } - } - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - String is_used = "1"; - if (StrUtil.equals("1", json.getString("is_used"))) { - is_used = "0"; - } - json.put("is_used", is_used); - json.put("update_optid", currentUserId); - json.put("update_optname", nickName); - json.put("update_time", now); - WQLObject.getWQLObject("sch_base_point").update(json); - - //如果启用，则同步更新仓位的状态 - Structattr struct = structattrService.findByCode(struct_code); - struct.setIs_used(is_used); - struct.setUpdate_id(currentUserId); - struct.setUpdate_name(nickName); - struct.setUpdate_time(now); - structattrService.updateById(struct); - } - - @Override - public JSONArray getPoint(Map wherJson) { - String area_type = (String) wherJson.get("area_type"); - JSONArray point_rows = WQLObject.getWQLObject("sch_base_point").query("region_id IN (" + area_type + ") AND is_used = '1' AND is_delete = '0' order by point_code").getResultJSONArray(0); - return point_rows; - } - - @Override - public Map selectPoint(Map whereJson, Pageable page) { - String search = MapUtil.getStr(whereJson, "search"); - String region_id = MapUtil.getStr(whereJson, "region_id"); - - JSONObject map = new JSONObject(); - - map.put("flag", "3"); - map.put("region_id", region_id); - if (ObjectUtil.isNotEmpty(search)) { - map.put("search", "%" + search + "%"); - } - JSONObject json = WQL.getWO("SCH_Point_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "point.point_code"); - return json; - } - - @Override - public JSONArray getRegion() { - JSONArray resultJSONArray = WQLObject.getWQLObject("SCH_BASE_Region").query().getResultJSONArray(0); - return resultJSONArray; - } - - /** - * 改变启用状态 - * - * @param jsonObject - */ - @Override - public void changeUsed(JSONObject jsonObject) { - WQLObject wo = WQLObject.getWQLObject("sch_base_Point"); - JSONArray data = jsonObject.getJSONArray("data"); - String used = jsonObject.getString("used"); - for (int i = 0; i < data.size(); i++) { - JSONObject object = data.getJSONObject(i); - if ("1".equals(used)) { - object.put("is_used", 1); - } else { - object.put("is_used", 0); - } - wo.update(object); - } - } - - /** - * 改变锁定类型 - * - * @param jsonObject - */ - @Override - public void changeLock(JSONObject jsonObject) { - WQLObject wo = WQLObject.getWQLObject("sch_base_Point"); - JSONArray data = jsonObject.getJSONArray("data"); - String lock = jsonObject.getString("lock_type"); - for (int i = 0; i < data.size(); i++) { - JSONObject object = data.getJSONObject(i); - if ("1".equals(lock)) { - object.put("lock_type", 1); - } else { - object.put("lock_type", 2); - } - wo.update(object); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void sync() { - - WQLObject wo = WQLObject.getWQLObject("sch_base_point"); - - // 先删除所有点位类型为仓位的点位 - WQLObject.getWQLObject("sch_base_point").delete(" point_type = '2'"); - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - JSONObject map = new JSONObject(); - map.put("flag", "2"); - JSONArray arrStruct = WQL.getWO("QSCH_BASE_POINT").addParamMap(map).process().getResultJSONArray(0); - - for (int i = 0; i < arrStruct.size(); i++) { - JSONObject json = arrStruct.getJSONObject(i); - JSONObject structMap = new JSONObject(); - structMap.put("point_id", IdUtil.getSnowflake(1, 1).nextId()); - structMap.put("point_code", json.getString("struct_code")); - structMap.put("point_name", json.getString("struct_name")); - structMap.put("region_id", json.get("sect_id")); - structMap.put("region_code", json.getString("sect_code")); - structMap.put("region_name", json.getString("sect_name")); - structMap.put("point_type", "2"); - structMap.put("point_status", "1"); - structMap.put("lock_type", json.getString("lock_type")); - structMap.put("block_num", json.getIntValue("block_num")); - structMap.put("row_num", json.getIntValue("row_num")); - structMap.put("col_num", json.getIntValue("col_num")); - structMap.put("layer_num", json.getIntValue("layer_num")); - structMap.put("source_id", json.getString("struct_id")); - structMap.put("create_id", currentUserId); - structMap.put("create_name", nickName); - structMap.put("create_time", now); - structMap.put("update_optid", currentUserId); - structMap.put("update_optname", nickName); - structMap.put("update_time", now); - wo.insert(structMap); - } - - } - @Override - public void download(Map whereJson, HttpServletResponse response) throws IOException { - HashMap map = new HashMap(); - map.put("flag", "1"); - map.put("region_id", whereJson.get("region_id")); - map.put("ids", whereJson.get("ids")); - map.put("lock_type", whereJson.get("lock_type")); - map.put("point_status", whereJson.get("point_status")); - map.put("is_used", whereJson.get("is_used")); - map.put("point_type", whereJson.get("point_type")); - map.put("name", whereJson.get("name")); - JSONArray content = WQL.getWO("QSCH_BASE_POINT").addParamMap(map).process().getResultJSONArray(0); - JSONArray res = new JSONArray(); - List> list = new ArrayList<>(); - for (int i = 0; i < content.size(); i++) { - JSONObject object = content.getJSONObject(i); - Long region_id = object.getLong("region_id"); - String point_status = object.getString("point_status"); - String point_type = object.getString("point_type"); - RegionDto regionDto = regionService.findById(region_id); - String point_status_explain = regionDto.getPoint_status_explain(); - String point_type_explain = regionDto.getPoint_type_explain(); - // 获取点位状态名称 - if (!ObjectUtil.isEmpty(point_status)) { - JSONObject statusArr = new JSONObject(); - String[] split = point_status_explain.split("，"); - for (int j = 0; j < split.length; j++) { - String[] status = split[j].split("-"); - statusArr.put(status[0], status[1]); - } - object.put("point_status_name", statusArr.getString(point_status)); - } - // 获取点位类型 - if (!ObjectUtil.isEmpty(point_type)) { - JSONObject typeArr = new JSONObject(); - String[] split = point_type_explain.split("，"); - for (int j = 0; j < split.length; j++) { - String[] types = split[j].split("-"); - typeArr.put(types[0], types[1]); - } - object.put("point_type_name", typeArr.getString(point_type)); - } - Map mp = new LinkedHashMap<>(); - mp.put("点位编码", object.getString("point_code")); - mp.put("点位名称", object.getString("point_name")); - mp.put("区域名称", object.getString("region_name")); - mp.put("点位类型", object.getString("point_type_name")); - mp.put("点位状态", object.getString("point_status_name")); - mp.put("锁定类型", object.getString("lock_type_name")); - mp.put("载具编码", object.getString("vehicle_code")); - mp.put("物料批次", object.getString("material_code")); - mp.put("载具数量", object.getString("vehicle_qty")); - mp.put("生产区域", object.getString("product_area")); - mp.put("备注", object.getString("remark")); - if ("0".equals(object.getString("is_used"))) { - mp.put("是否启用", "否"); - } - if ("1".equals(object.getString("is_used"))) { - mp.put("是否启用", "是"); - } - mp.put("修改人", object.getString("update_optname")); - mp.put("修改时间", object.getString("update_time")); - list.add(mp); - } - FileUtil.downloadExcel(list, response); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java deleted file mode 100644 index d0c01dd..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java +++ /dev/null @@ -1,193 +0,0 @@ -package org.nl.wms.sch.service.impl; - - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.utils.SecurityUtils; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.sch.service.RegionService; -import org.nl.wms.sch.service.dto.RegionDto; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author Liuxy - * @description 服务实现 - * @date 2022-08-11 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class RegionServiceImpl implements RegionService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String region_code = MapUtil.getStr(whereJson, "region_code"); - - HashMap map = new HashMap<>(); - map.put("flag", "1"); - if (ObjectUtil.isNotEmpty(region_code)) { - map.put("region_code", region_code + "%"); - } - - JSONObject json = WQL.getWO("QSCH_REGION_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "region.region_code ASC"); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("sch_base_region"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) { - return arr.toJavaList(RegionDto.class); - } - return null; - } - - @Override - public RegionDto findById(Long region_id) { - WQLObject wo = WQLObject.getWQLObject("sch_base_region"); - JSONObject json = wo.query("region_id = '" + region_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(RegionDto.class); - } - return null; - } - - @Override - public RegionDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("sch_base_region"); - JSONObject json = wo.query("region_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(RegionDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(RegionDto dto) { - WQLObject wo = WQLObject.getWQLObject("sch_base_region"); - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - JSONObject jsonDto = wo.query("region_code = '" + dto.getRegion_code() + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonDto)) { - throw new BadRequestException("编码已存在"); - } - - dto.setRegion_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(RegionDto dto) { - RegionDto entity = this.findById(dto.getRegion_id()); - if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); - } - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - - WQLObject wo = WQLObject.getWQLObject("sch_base_region"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - - WQLObject wo = WQLObject.getWQLObject("sch_base_region"); - for (Long region_id : ids) { - wo.delete("region_id ='" + region_id + "'"); - } - } - - /** - * 获取点位状态下拉框 - * - * @param region_id - * @return - */ - @Override - public JSONArray getPointStatusSelectById(Long region_id) { - /** - * label,value - */ - JSONArray res = new JSONArray(); - String point_status_explain = findById(region_id).getPoint_status_explain(); - if (ObjectUtil.isEmpty(point_status_explain)) { - return res; - } - String[] explain = point_status_explain.split("，"); - for (int i = 0; i < explain.length; i++) { - String[] status = explain[i].split("-"); - JSONObject point_status = new JSONObject(); - point_status.put("label", status[1]); - point_status.put("value", status[0]); - res.add(point_status); - } - return res; - } - - /** - * 获取点位类型下拉框 - * - * @param region_id - * @return - */ - @Override - public JSONArray getPointTypeSelectById(Long region_id) { - /** - * label,value - */ - JSONArray res = new JSONArray(); - String point_type_explain = findById(region_id).getPoint_type_explain(); - if (ObjectUtil.isEmpty(point_type_explain)) { - return res; - } - String[] explain = point_type_explain.split("，"); - for (int i = 0; i < explain.length; i++) { - String[] types = explain[i].split("-"); - JSONObject point_type = new JSONObject(); - point_type.put("label", types[1]); - point_type.put("value", types[0]); - res.add(point_type); - } - return res; - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java deleted file mode 100644 index 5bbe3d3..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ /dev/null @@ -1,199 +0,0 @@ -package org.nl.wms.sch.service.impl; - - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.utils.SecurityUtils; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.basedata.master.classstandard.service.dao.ClassStandard; -import org.nl.wms.basedata.master.classstandard.service.dao.mapper.ClassStandardMapper; -import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService; -import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.service.TaskService; -import org.redisson.api.RLock; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -/** - * @author ldjun - * @description 服务实现 - * @date 2021-08-19 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class TaskServiceImpl implements TaskService { - - private final RedissonClient redissonClient; - @Autowired - private ClassStandardMapper classStandardMapper; - @Autowired - IUserAreaPermissionService userAreaPermissionService; - @Override - public Map queryAll(Map form, Pageable page) { - - HashMap map = new HashMap<>(); - map.put("flag", "1"); - - JSONObject whereJson = JSONObject.parseObject(JSON.toJSONString(form)); - - String task_status = whereJson.getString("task_status"); - if (StrUtil.isNotEmpty(task_status)) { - task_status = task_status.replace("[\"", "").replace("\"]", "").replace("\"", ""); - } - map.put("task_status", task_status); - //处理状态为未完成 - if (StrUtil.isNotEmpty(task_status) && task_status.contains("-1")) { - map.put("unFinish", "-1"); - map.put("task_status", task_status.replace("-1", "")); - } - if (StrUtil.isNotEmpty(whereJson.getString("task_code"))) { - map.put("task_code", "%" + whereJson.getString("task_code") + "%"); - } - if (StrUtil.isNotEmpty(whereJson.getString("point_code1"))) { - map.put("point_code1", "%" + whereJson.getString("point_code1") + "%"); - } - if (StrUtil.isNotEmpty(whereJson.getString("point_code2"))) { - map.put("point_code2", "%" + whereJson.getString("point_code2") + "%"); - } - if (StrUtil.isNotEmpty(whereJson.getString("vehicle_code"))) { - map.put("vehicle_code", "%" + whereJson.getString("vehicle_code") + "%"); - } - if (StrUtil.isNotEmpty(whereJson.getString("task_type"))) { - ClassStandard dto = classStandardMapper.selectById(whereJson.getString("task_type")); - //需要优化为myb plus版本查询 - //String task_type = classstandardService.getChildIdStr(dto.getClass_id()); - //map.put("task_type", task_type); - } - if (StrUtil.isNotEmpty(whereJson.getString("finishTypeList"))) { - map.put("finishTypeList", whereJson.getString("finishTypeList")); - } - if (StrUtil.isNotEmpty(whereJson.getString("begin_time"))) { - map.put("begin_time", whereJson.getString("begin_time")); - } - if (StrUtil.isNotEmpty(whereJson.getString("end_time"))) { - map.put("end_time", whereJson.getString("end_time")); - } - if (StrUtil.isNotEmpty(whereJson.getString("is_delete"))) { - map.put("is_delete", whereJson.getString("is_delete")); - } -// 获取人员对应的区域 - String in_area_id = userAreaPermissionService.getInArea(); - if (ObjectUtil.isNotEmpty(in_area_id)) { - map.put("in_area_id", in_area_id); - } - JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); - JSONArray content = json.getJSONArray("content"); - JSONArray res = new JSONArray(); - - //点位基础表【SCH_BASE_Point】 - WQLObject schBasePointService = WQLObject.getWQLObject("SCH_BASE_Point"); - for (int i = 0; i < content.size(); i++) { - JSONObject taskObj = content.getJSONObject(i); - res.add(taskObj); - } - json.put("content", res); - return json; - } - - @Override - @Transactional(rollbackFor = Exception.class) - @SneakyThrows - public void operation(Map map) { - String task_id = MapUtil.getStr(map, "task_id"); - RLock lock = redissonClient.getLock(task_id); - boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS); - try { - if (tryLock) { - String method_name = MapUtil.getStr(map, "method_name"); - JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); - if ("finish".equals(method_name)) { - //强制执行，只把任务变更成完成状态 - // 更改任务状态为完成 - taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); - taskObj.put("update_optid", SecurityUtils.getCurrentUserId()); - taskObj.put("update_optname", SecurityUtils.getCurrentUsername()); - taskObj.put("update_time", DateUtil.now()); - taskObj.put("remark", "任务被用户:" + SecurityUtils.getCurrentUsername() + "在:" + DateUtil.now() + "强制完成。"); - WQLObject.getWQLObject("SCH_BASE_Task").update(taskObj); - } else { - // 任务处理类 - String processing_class = taskObj.getString("handle_class"); - String message = ""; - - try { - Object obj = new Object(); - try { - obj = SpringContextHolder.getBean(Class.forName(processing_class)); - } catch (Exception e) { - Class clz = Class.forName(processing_class); - obj = clz.newInstance(); - } - // 调用每个任务类的method_name()强制结束方法 - Method m = obj.getClass().getMethod(method_name, String.class); - JSONObject result = (JSONObject) m.invoke(obj, task_id); - if (ObjectUtil.isEmpty(result)) { - return; - } - JSONArray arr = result.getJSONArray("errArr"); - WQLObject wo = WQLObject.getWQLObject("sch_base_task"); - if (ObjectUtil.isNotEmpty(arr)) { - for (int i = 0; i < arr.size(); i++) { - JSONObject json = arr.getJSONObject(i); - JSONObject param = new JSONObject(); - param.put("task_id", json.getString("task_id")); - param.put("remark", json.getString("message")); - wo.update(param); - } - throw new BadRequestException("任务操作失败!"); - } else { - JSONObject param = new JSONObject(); - param.put("task_id", task_id); - param.put("remark", "操作成功"); - wo.update(param); - } - } catch (InvocationTargetException e) { - if (ObjectUtil.isNull(e.getTargetException().getMessage())) { - message = e.getTargetException().toString(); - } else { - message = e.getTargetException().getMessage(); - } - throw new BadRequestException(message); - } catch (Exception e) { - e.printStackTrace(); - throw new BadRequestException(e.getMessage()); - } - } - } else { - throw new BadRequestException("任务标识为：" + task_id + "的任务正在操作中！"); - } - } finally { - if (tryLock) { - lock.unlock(); - } - } - - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql deleted file mode 100644 index 01f0617..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql +++ /dev/null @@ -1,102 +0,0 @@ -[交易说明] - 交易名： 基础点位分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.region_id TYPEAS s_string - 输入.lock_type TYPEAS s_string - 输入.name TYPEAS s_string - 输入.point_type TYPEAS s_string - 输入.point_status TYPEAS s_string - 输入.is_used TYPEAS s_string - 输入.ids TYPEAS f_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - point.*, - d3.label as lock_type_name - FROM - sch_base_point point - LEFT JOIN SCH_BASE_Region region ON point.region_id = region.region_id - LEFT JOIN sys_dict d3 ON point.lock_type = d3.value and d3.code='d_lock_type' - WHERE - point.is_delete = '0' - OPTION 输入.region_id <> "" - point.region_id = 输入.region_id - ENDOPTION - OPTION 输入.ids <> "" - point.area_type in (输入.ids) - ENDOPTION - OPTION 输入.point_type <> "" - point.point_type = 输入.point_type - ENDOPTION - OPTION 输入.lock_type <> "" - point.lock_type = 输入.lock_type - ENDOPTION - OPTION 输入.point_status <> "" - point.point_status = 输入.point_status - ENDOPTION - OPTION 输入.lock_type = "00" - (point.vehicle_code is null or point.vehicle_code = '') - ENDOPTION - OPTION 输入.is_used <> "" - point.is_used = 输入.is_used - ENDOPTION - OPTION 输入.name <> "" - ( point.point_code like "%" 输入.name "%" or point.point_name like "%" 输入.name "%" ) - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - struct.*,region.region_id - FROM - ST_IVT_StructAttr struct - left join - SCH_BASE_Region region on struct.sect_id = region.region_id - WHERE - struct.is_delete = '0' - ENDSELECT - ENDQUERY - ENDIF - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_REGION_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_REGION_01.wql deleted file mode 100644 index 9bb640f..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_REGION_01.wql +++ /dev/null @@ -1,57 +0,0 @@ -[交易说明] - 交易名： 区域分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.region_code TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - region.* - FROM - SCH_BASE_Region region - WHERE - 1=1 - - OPTION 输入.region_code <> "" - (region.region_code like 输入.region_code or - region.region_name like 输入.region_code) - ENDOPTION - - ENDSELECT - ENDPAGEQUERY - ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql deleted file mode 100644 index c18a744..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql +++ /dev/null @@ -1,111 +0,0 @@ -[交易说明] - 交易名： 任务分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.task_status TYPEAS s_string - 输入.finished_type TYPEAS s_string - 输入.task_type TYPEAS f_string - 输入.in_area_id TYPEAS f_string - 输入.point_code1 TYPEAS s_string - 输入.point_code2 TYPEAS s_string - 输入.task_code TYPEAS s_string - 输入.vehicle_code TYPEAS s_string - 输入.begin_time TYPEAS s_string - 输入.end_time TYPEAS s_string - 输入.is_delete TYPEAS s_string - 输入.unFinish TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT * FROM ( - SELECT - task.*, - md.class_name task_type_name, - user.person_name AS create_name1, - dict.label task_status_name, - case when task.task_type like '0105%' then 'LK' when task.task_type like '0107%' then 'LK' ELSE task.product_area end AS final_product_area - FROM - sch_base_task task - LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code - LEFT JOIN sys_user user ON user.username = task.create_name - LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status' - WHERE - 1=1 - OPTION 输入.is_delete <> "" - task.is_delete = 输入.is_delete - ENDOPTION - OPTION 输入.task_type <> "" - md.class_id in 输入.task_type - ENDOPTION - OPTION 输入.finished_type <> "" - task.finished_type = 输入.finished_type - ENDOPTION - OPTION 输入.begin_time <> "" - task.create_time >= 输入.begin_time - ENDOPTION - OPTION 输入.end_time <> "" - task.create_time <= 输入.end_time - ENDOPTION - OPTION 输入.unFinish <> "" - task.task_status <> '07' - ENDOPTION - OPTION 输入.task_status <> "" - find_in_set( task.task_status, 输入.task_status) - ENDOPTION - OPTION 输入.vehicle_code <> "" - (task.vehicle_code like 输入.vehicle_code OR task.material_code like 输入.vehicle_code OR task.vehicle_code2 like 输入.vehicle_code) - ENDOPTION - OPTION 输入.task_code <> "" - (task.task_code like 输入.task_code) - ENDOPTION - OPTION 输入.point_code1 <> "" - (task.point_code1 like 输入.point_code1) - ENDOPTION - OPTION 输入.begin_time <> "" - task.create_time >= 输入.begin_time - ENDOPTION - OPTION 输入.end_time <> "" - task.create_time <= 输入.end_time - ENDOPTION - ) a - WHERE 1=1 - OPTION 输入.in_area_id <> "" - a.final_product_area IN 输入.in_area_id - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql deleted file mode 100644 index ac9cc64..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql +++ /dev/null @@ -1,119 +0,0 @@ -[交易说明] - 交易名： 点位管理查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.search TYPEAS s_string - 输入.point_type TYPEAS s_string - 输入.point_code TYPEAS s_string - 输入.region_id TYPEAS s_string - 输入.point_status TYPEAS s_string - 输入.lock_type TYPEAS s_string - 输入.is_used TYPEAS s_string - 输入.material_id TYPEAS s_string - 输入.vehicle_type TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - a.*,b.device_name - FROM - sch_base_point a - left join - pdm_base_device b on a.device_id = b.device_id - WHERE - a.is_delete = '0' - OPTION 输入.search <> "" - (a.point_code like 输入.search or - a.point_name like 输入.search) - ENDOPTION - OPTION 输入.point_type <> "" - a.point_type = 输入.point_type - ENDOPTION - OPTION 输入.area_type <> "" - a.area_type = 输入.area_type - ENDOPTION - OPTION 输入.point_status <> "" - a.point_status = 输入.point_status - ENDOPTION - OPTION 输入.lock_type <> "" - a.lock_type = 输入.lock_type - ENDOPTION - OPTION 输入.is_used <> "" - a.is_used = 输入.is_used - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "2" - PAGEQUERY - SELECT - a.*,b.sect_code - FROM - ST_IVT_StructAttr a - left join - ST_IVT_SectAttr b on a.sect_id = b.sect_id - WHERE - a.is_delete = '0' - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "3" - PAGEQUERY - SELECT - point.* - FROM - sch_base_point point - WHERE - point.lock_type = '00' - AND point.is_used = '1' - AND point.is_delete = '0' - AND point.point_status = '00' - - OPTION 输入.search <> "" - (point.point_code like 输入.search or - point.point_name like 输入.search) - ENDOPTION - - OPTION 输入.region_id <> "" - point.region_id = 输入.region_id - ENDOPTION - - ENDSELECT - ENDPAGEQUERY - ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java index a33d4a1..59d89b8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java @@ -9,6 +9,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.sch.point.dao.SchBasePoint; +import org.nl.b_lms.sch.point.service.IschBasePointService; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; @@ -18,12 +20,9 @@ import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.wms.basedata.master.interfaceback.service.dao.InterfaceBack; import org.nl.wms.basedata.master.interfaceback.service.dao.mapper.InterfaceBackMapper; import org.nl.wms.ext.mes.service.LmsToMesService; -import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.service.PointService; -import org.nl.wms.sch.service.dto.PointDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -110,9 +109,9 @@ public class InCoolIvtTask extends AbstractAcsTask { String point_code1 = jsonTask.getString("point_code1"); String point_code2 = jsonTask.getString("point_code2"); - PointService point = SpringContextHolder.getBean(PointService.class); + IschBasePointService point = SpringContextHolder.getBean(IschBasePointService.class); // 校验起点是否存在 - PointDto startDto = point.findByCode(point_code1); + SchBasePoint startDto = point.findByCode(point_code1); if (ObjectUtil.isEmpty(startDto)) { throw new BadRequestException("起点未找到可用点位:" + point_code1); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java index a96123f..6ad69e9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java @@ -3,7 +3,6 @@ package org.nl.wms.st.inbill.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; @@ -14,12 +13,13 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.sch.point.dao.SchBasePoint; +import org.nl.b_lms.sch.point.service.IschBasePointService; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.WqlUtil; import org.nl.system.service.param.ISysParamService; import org.nl.wms.basedata.master.unit.service.dao.Unit; @@ -35,8 +35,6 @@ import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; import org.nl.wms.pda.mps.eum.RegionTypeEnum; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.service.PointService; -import org.nl.wms.sch.service.dto.PointDto; import org.nl.wms.sch.tasks.InTask; import org.nl.wms.st.inbill.service.RawAssistIStorService; import org.nl.wms.st.inbill.service.StorPublicService; @@ -70,7 +68,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { @Autowired private StructattrService structattrService; - private final PointService pointService; + private final IschBasePointService pointService; @Autowired private StructattrMapper structattrMapper; @@ -543,7 +541,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { String point_code = map.get("point_code"); if (StrUtil.isNotEmpty(point_code)) { HashMap point_map = new HashMap<>(); - PointDto pointDto = pointService.findByCode(point_code); + SchBasePoint pointDto = pointService.findByCode(point_code); point_map.put("point_code", pointDto.getPoint_code()); point_map.put("point_id", pointDto.getPoint_id() + ""); point_map.put("point_name", pointDto.getPoint_name()); @@ -903,7 +901,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { HashMap map = rows.get(0); HashMap point_map = new HashMap<>(); - PointDto pointDto = pointService.findByCode(point_code); + SchBasePoint pointDto = pointService.findByCode(point_code); point_map.put("point_code", pointDto.getPoint_code()); point_map.put("point_id", pointDto.getPoint_id() + ""); point_map.put("point_name", pointDto.getPoint_name()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java index cf8b69a..f1d2063 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java @@ -1,7 +1,7 @@ package org.nl.wms.stat.service; import com.alibaba.fastjson.JSONObject; -import org.nl.wms.sch.service.dto.PointDto; +import org.nl.b_lms.sch.point.dao.SchBasePoint; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; @@ -33,7 +33,7 @@ public interface InBillQueryService { * @param whereJson 条件参数 * @return List */ - List queryAll(Map whereJson); + List queryAll(Map whereJson); /** * 创建 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/OutBillQueryService.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/OutBillQueryService.java index 664258f..67e8dcb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/OutBillQueryService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/OutBillQueryService.java @@ -1,7 +1,7 @@ package org.nl.wms.stat.service; import com.alibaba.fastjson.JSONObject; -import org.nl.wms.sch.service.dto.PointDto; +import org.nl.b_lms.sch.point.dao.SchBasePoint; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; @@ -33,7 +33,7 @@ public interface OutBillQueryService { * @param whereJson 条件参数 * @return List */ - List queryAll(Map whereJson); + List queryAll(Map whereJson); /** * 创建 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/PastIvtQueryService.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/PastIvtQueryService.java index c342cba..7515109 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/PastIvtQueryService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/PastIvtQueryService.java @@ -1,7 +1,7 @@ package org.nl.wms.stat.service; import com.alibaba.fastjson.JSONObject; -import org.nl.wms.sch.service.dto.PointDto; +import org.nl.b_lms.sch.point.dao.SchBasePoint; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; @@ -31,7 +31,7 @@ public interface PastIvtQueryService { * @param whereJson 条件参数 * @return List */ - List queryAll(Map whereJson); + List queryAll(Map whereJson); /** * 创建 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java index 6721cf8..f2b414c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java @@ -10,18 +10,20 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.sch.point.dao.SchBasePoint; +import org.nl.b_lms.sch.point.service.IschBasePointService; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.FileUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.sch.service.dto.PointDto; import org.nl.wms.stat.service.InBillQueryService; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; @@ -39,7 +41,8 @@ import java.util.Map; @Slf4j public class InBillQueryServiceImpl implements InBillQueryService { - + @Resource + private IschBasePointService schBasePointService; @Override public Map queryAll(Map whereJson, Pageable page, String[] product_area) { String stor_id = MapUtil.getStr(whereJson, "stor_id"); @@ -171,10 +174,8 @@ public class InBillQueryServiceImpl implements InBillQueryService { } @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("sch_base_point"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(PointDto.class); + public List queryAll(Map whereJson) { + List list = schBasePointService.list(); return list; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java index 2f1d4b4..479497f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java @@ -2,25 +2,26 @@ package org.nl.wms.stat.service.impl; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.sch.point.dao.SchBasePoint; +import org.nl.b_lms.sch.point.service.IschBasePointService; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.FileUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.sch.service.dto.PointDto; import org.nl.wms.stat.service.OutBillQueryService; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.*; @@ -36,7 +37,8 @@ import java.util.stream.Collectors; @Slf4j public class OutBillQueryServiceImpl implements OutBillQueryService { - + @Resource + private IschBasePointService schBasePointService; @Override public Map queryAll(Map whereJson, Pageable page, String[] bill_types) { String stor_id = MapUtil.getStr(whereJson, "stor_id"); @@ -142,10 +144,8 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { } @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("sch_base_point"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(PointDto.class); + public List queryAll(Map whereJson) { + List list = schBasePointService.list(); return list; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/PastIvtQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/PastIvtQueryServiceImpl.java index 38a62d0..cfef073 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/PastIvtQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/PastIvtQueryServiceImpl.java @@ -7,17 +7,19 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.sch.point.dao.SchBasePoint; +import org.nl.b_lms.sch.point.service.IschBasePointService; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.utils.FileUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.sch.service.dto.PointDto; import org.nl.wms.stat.service.PastIvtQueryService; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; @@ -34,7 +36,8 @@ import java.util.Map; @RequiredArgsConstructor @Slf4j public class PastIvtQueryServiceImpl implements PastIvtQueryService { - + @Resource + private IschBasePointService schBasePointService; @Override public Map queryAll(Map whereJson, Pageable page) { @@ -89,10 +92,8 @@ public class PastIvtQueryServiceImpl implements PastIvtQueryService { } @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("sch_base_point"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(PointDto.class); + public List queryAll(Map whereJson) { + List list = schBasePointService.list(); return list; } diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue index 8e9b7a1..5759896 100644 --- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue @@ -188,27 +188,6 @@ > 解锁 - - - import crudRegion from '@/views/wms/sch/region/region' -import crudPoint, { changeActive, changeActives } from '@/views/wms/sch/point/point' +import crudPoint from '@/views/wms/sch/point/point' import CRUD, { crud, form, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' @@ -511,7 +485,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - changeActive(data).then(res => { + crudPoint.changeActive(data).then(res => { this.crud.toQuery() this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) }).catch(() => { @@ -563,15 +537,6 @@ export default { this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() }) - }, - sync() { - this.sync_flag = true - crudPoint.sync().then(res => { - this.crud.notify('同步成功', CRUD.NOTIFICATION_TYPE.SUCCESS) - this.sync_flag = false - }).cache(() => { - this.sync_flag = false - }) } } diff --git a/lms/nladmin-ui/src/views/wms/sch/point/point.js b/lms/nladmin-ui/src/views/wms/sch/point/point.js index 0bf8d9a..918a0a9 100644 --- a/lms/nladmin-ui/src/views/wms/sch/point/point.js +++ b/lms/nladmin-ui/src/views/wms/sch/point/point.js @@ -23,11 +23,6 @@ export function edit(data) { data }) } -export function findPoints(area_type) { - return request({ - url: 'api/point/area_type/' + area_type - }) -} export function changeActive(data) { return request({ @@ -55,7 +50,7 @@ export function getPoint(data) { export function getRegion() { return request({ - url: '/api/point/getRegion', + url: '/api/region/getRegion', method: 'get' }) } @@ -76,13 +71,6 @@ export function changeLock(data) { }) } -export function sync() { - return request({ - url: 'api/point/sync', - method: 'post' - }) -} - export function download() { return request({ url: 'api/point/download', @@ -90,4 +78,4 @@ export function download() { }) } -export default { add, edit, del, changeActive, changeActives, findPoints, getPoint, getRegion, changeUsed, changeLock, sync } +export default { add, edit, del, changeActive, changeActives, getPoint, getRegion, changeUsed, changeLock }