diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/PackageInfoIvtEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/PackageInfoIvtEnum.java index 5226754..76ad3f4 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/PackageInfoIvtEnum.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/PackageInfoIvtEnum.java @@ -37,7 +37,7 @@ public enum PackageInfoIvtEnum { //是否启用 IS_USED(MapOf.of("启用", "1", "未启用", "0")), //agv二次分配类型 - AGV_ACTION_TYPE(MapOf.of("普通任务", "1", "取货二次分配", "2", "放货二次分配", "3", "取放货二次分配", "4","HXT取放货二次分配","5")), + AGV_ACTION_TYPE(MapOf.of("普通任务", "1", "取货二次分配", "2", "放货二次分配", "3", "E2取放货二次分配", "4","HXT取放货二次分配","5")), //二次分配请求类型 TASK_ACTION_TYPE(MapOf.of("普通任务", "1", "取货二次分配", "2", "放货二次分配", "3", "取放货二次分配", "4")), //是否自动下发 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java index 42fa350..743b04e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java @@ -18,6 +18,7 @@ package org.nl.common.logging.aspect; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; @@ -132,7 +133,7 @@ public class LogAspect { if (argList.size() == 0) { return ""; } - return argList.size() == 1 ? JSONUtil.toJsonStr(argList.get(0)) : JSONUtil.toJsonStr(argList); + return argList.size() == 1 ? JSONUtil.toJsonStr(JSON.toJSONString(argList.get(0))) : JSONUtil.toJsonStr(argList); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java index e86d31c..789b49c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java @@ -280,7 +280,7 @@ public class OnlineUserService { * loginInfo: Token挂载的扩展参数 （此方法只有在集成jwt插件时才会生效） */ StpUtil.login(userInfo.getUser_id(), new SaLoginModel() - .setDevice("PC") + .setDevice("LMS") .setExtra("loginInfo", user) ); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdMeMaterialbaseMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdMeMaterialbaseMapper.java index 3390b6e..adb139c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdMeMaterialbaseMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdMeMaterialbaseMapper.java @@ -18,4 +18,6 @@ import java.util.List; public interface MdMeMaterialbaseMapper extends BaseMapper { List selectAllMaters(@Param("param") JSONObject whereJson); + + List getMaterialTypes(); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdMeMaterialbaseMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdMeMaterialbaseMapper.xml index 7361c07..bc66d1a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdMeMaterialbaseMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdMeMaterialbaseMapper.xml @@ -4,16 +4,26 @@ + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/controller/PdaTaskController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/controller/PdaTaskController.java index 9428880..e4ecdff 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/controller/PdaTaskController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/controller/PdaTaskController.java @@ -48,6 +48,12 @@ public class PdaTaskController { return new ResponseEntity<>(pdaTaskService.selectMaterials(whereJson), HttpStatus.OK); } + @PostMapping("/getMaterialTypes") + @Log("查询物料信息") + public ResponseEntity getMaterialTypes() { + return new ResponseEntity<>(pdaTaskService.getMaterialTypes(), HttpStatus.OK); + } + @PostMapping("/getRegions") @Log("获取所有区域") public ResponseEntity getRegions() { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java index 0923879..b698572 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java @@ -64,4 +64,6 @@ public interface PdaTaskService { JSONObject getEndRegions(); JSONObject getChargeRegions(); + + JSONObject getMaterialTypes(); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java index 5c0683b..b38b59a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java @@ -159,7 +159,7 @@ public class PdaTaskServiceImpl implements PdaTaskService { String prefix = schBasePoint.getPoint_code().substring(0, schBasePoint.getPoint_code().length() - 2); List existTask = taskService.findUnFinishTasksByTaskConfig("THSLTask", prefix); if (existTask.size() <= 1) { - List list = pointMapper.selectListByRegionAndPrefix(region_code, prefix); + List list = pointMapper.selectListByRegionAndPrefix(region_code, prefix,schBasePoint.getPoint_type()); if (list.size() == 0) { throw new BadRequestException(region_code + "区域无空闲点位"); } @@ -463,6 +463,26 @@ public class PdaTaskServiceImpl implements PdaTaskService { return ret; } + @Override + public JSONObject getMaterialTypes() { + List list = mdMeMaterialbaseMapper.getMaterialTypes(); + List arr = new ArrayList<>(); + JSONObject ret = new JSONObject(); + if (ObjectUtil.isNotEmpty(list)) { + list.forEach(point -> { + JSONObject jo = new JSONObject(); + jo.put("value", point.getString("material_type")); + jo.put("text", point.getString("material_type")); + arr.add(jo); + }); + ret.put("code", String.valueOf(HttpStatus.HTTP_OK)); + ret.put("message", "查询成功"); + ret.put("data", arr); + return ret; + } + return ret; + } + @Override public JSONObject getMaterialInfoByPoint(JSONObject whereJson) { String point_code = whereJson.getString("point_code"); @@ -627,7 +647,7 @@ public class PdaTaskServiceImpl implements PdaTaskService { public JSONObject vehicleBinding(JSONObject whereJson) { String point_code = whereJson.getString("point_code"); SchBasePoint point = pointMapper.selectOne(new LambdaQueryWrapper().eq(SchBasePoint::getPoint_code, point_code)); - point.setPoint_status("1"); + point.setPoint_status("2"); pointMapper.updateById(point); JSONObject ret = new JSONObject(); ret.put("status", String.valueOf(HttpStatus.HTTP_OK)); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/MaterialRecord.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/MaterialRecord.java index 019ead1..baf1ab1 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/MaterialRecord.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/MaterialRecord.java @@ -30,6 +30,8 @@ public class MaterialRecord implements Serializable { */ private String material_name; + private String material_type; + private String region_code; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialRecordServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialRecordServiceImpl.java index 226ebd2..d86658d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialRecordServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialRecordServiceImpl.java @@ -54,17 +54,13 @@ public class MaterialRecordServiceImpl extends ServiceImpl() .eq(MdMeMaterialbase::getMaterial_code, entity.getMaterial_code())); - String measure_unit_id = mdMeMaterialbase.getMeasure_unit_id(); - Measureunit measureunit = measureunitMapper.selectById(measure_unit_id); + String getUnit_name = mdMeMaterialbase.getUnit_name(); entity.setRecord_id(IdUtil.getSnowflake(1, 1).nextIdStr()); entity.setRegion_name(schBaseRegion.getRegion_name()); - entity.setMeasure_unit_id(measureunit.getUnit_name()); + entity.setMeasure_unit_id(getUnit_name); entity.setCreate_id(currentUserId); entity.setCreate_name(nickName); entity.setCreate_time(now); - entity.setUpdate_id(currentUserId); - entity.setUpdate_name(nickName); - entity.setUpdate_time(now); materialRecordMapper.insert(entity); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java index 84162ba..1d0eae3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java @@ -47,7 +47,7 @@ public interface SchBasePointMapper extends BaseMapper { List checkEndPointTask(SchBaseTask baseTask); - List selectListByRegionAndPrefix(@Param("region_code") String region_code, @Param("prefix") String prefix); + List selectListByRegionAndPrefix(@Param("region_code") String region_code, @Param("prefix") String prefix,@Param("point_type") String point_type); List selectSameRowPoints(@Param("point") SchBasePoint point); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml index a3993b8..a5ea8a7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml @@ -192,7 +192,7 @@ AND is_delete = '0' ) AND point_code LIKE CONCAT(#{prefix}, '%') - AND point_type = '3' + AND point_type = #{point_type} AND is_used = 1 AND point_status = '1' ORDER BY in_order_seq desc @@ -219,7 +219,7 @@ SELECT * FROM `sch_base_point` p WHERE p.region_code = #{region_code} - AND p.parent_point_code == #{point_code2} + AND p.parent_point_code = #{point_code2} AND (point_type = '1' OR point_type = '3') AND is_used = 1 AND point_status = "1" diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/PdaPointTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/PdaPointTask.java index 60684f6..454bfee 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/PdaPointTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/PdaPointTask.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.IdUtil; @@ -88,8 +89,10 @@ public class PdaPointTask extends AbstractTask { String requestParam = task.getRequest_param(); JSONObject jsonObject = JSONObject.parseObject(requestParam); String point_code2 = jsonObject.getString("point_code2"); + // 设置终点并修改创建成功状态 task.setPoint_code2(point_code2); + task.setVehicle_code2(PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务")); task.setRemark(""); task.setTask_status(TaskStatus.CREATED.getCode()); taskService.save(task); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/thsl/mapper/THSLMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/thsl/mapper/THSLMapper.xml index d4dd09e..b67676e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/thsl/mapper/THSLMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/thsl/mapper/THSLMapper.xml @@ -22,7 +22,7 @@ AND g.material_code = #{material_code} AND p.point_status = '2' AND p.is_used = 1 - AND (p.region_code = 'E2' OR p.region_code = 'H1' OR p.region_code = 'H2') + AND (p.region_code = 'E2' OR p.region_code = 'H1' OR p.region_code = 'H2' OR p.region_code = 'HXTFZW')