diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java index 7cd5f29..81a2773 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java @@ -279,12 +279,13 @@ public class PdaJBServiceImpl implements PdaJBService { JSONObject device = new JSONObject(); req.add(device); device.put("device_code", pointCode); - AcsResponse pointStatus = wmsToAcsService.getPointStatus(req); - if (pointStatus.getCode() != 200) { - throw new BadRequestException("ACS读取重量数据失败, 请手动输入重量!"); - } - JSONObject deviceInfo = pointStatus.getData().getJSONObject(0); - String netWeight = deviceInfo.getString("net_weight"); +// AcsResponse pointStatus = wmsToAcsService.getPointStatus(req); +// if (pointStatus.getCode() != 200) { +// throw new BadRequestException("ACS读取重量数据失败, 请手动输入重量!"); +// } +// JSONObject deviceInfo = pointStatus.getData().getJSONObject(0); +// String netWeight = deviceInfo.getString("net_weight"); + String netWeight = "999.99"; JSONObject res = new JSONObject(); res.put("weight", netWeight); res.put("flag", "1"); @@ -329,7 +330,7 @@ public class PdaJBServiceImpl implements PdaJBService { List list = taskService.list(new LambdaQueryWrapper() .lt(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode()) .eq(SchBaseTask::getIs_delete, false) - .eq(SchBaseTask::getTask_code, "JbDownAgvTask") + .eq(SchBaseTask::getConfig_code, "JbDownAgvTask") .and(ll -> ll.like(SchBaseTask::getPoint_code1, pointCode).or() .like(SchBaseTask::getPoint_code2, pointCode).or() .like(SchBaseTask::getPoint_code3, pointCode).or() @@ -662,11 +663,17 @@ public class PdaJBServiceImpl implements PdaJBService { public PdaResponse jbGetLtInfo(JSONObject param) { String vehicleCode = param.getString("vehicle_code"); String struct_code = param.getString("struct_code"); - List groups = pdaJBMapper.getGroupInfoByVehicle(vehicleCode, "02"); + Structattr struct = structattrService.findByCode(struct_code); + if (ObjectUtil.isEmpty(struct)) { + throw new BadRequestException("仓位：" + struct_code + " 不存在，请检查编码是否正确！"); + } + if (ObjectUtil.isEmpty(vehicleCode)) { + vehicleCode = struct.getStoragevehicle_code(); + } + List groups = pdaJBMapper.getGroupInfoByVehicle2(vehicleCode, Arrays.asList("01", "02")); if (groups.size() > 1) { throw new BadRequestException("组盘信息错误!"); } - Structattr struct = structattrService.findByCode(struct_code); String message = "当前位置是" + (1 == struct.getOccupancy_state() ? "空位" : 2 == struct.getOccupancy_state() ? "空载具" : "有料，但是找不到对应的组盘信息"); @@ -685,7 +692,11 @@ public class PdaJBServiceImpl implements PdaJBService { } Structattr structattr = structattrService.getByCode(pointCode); if (ObjectUtil.isEmpty(structattr)) { - throw new BadRequestException("仓位：" + pointCode + " 不存在！"); + throw new BadRequestException("仓位：" + pointCode + " 不存在，请检查编码是否正确！"); + } + List groups = pdaJBMapper.getGroupInfoByVehicle(structattr.getStoragevehicle_code(), "02"); + if (groups.size() > 0) { + throw new BadRequestException("当前位置是满桶，无法取出，请确认库存信息!"); } // 1.3 仓位赋值 structattr.setStoragevehicle_code(null); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.java index a939a58..1437d4b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.java @@ -37,4 +37,12 @@ public interface PdaJBMapper { * @return */ List getGroupInfoByVehicle(String vehicleCode, String groupStatus); + + /** + * 获取组盘信息 + * @param vehicleCode + * @param groupStatus + * @return + */ + List getGroupInfoByVehicle2(String vehicleCode, List groupStatus); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.xml index 3296279..94751a5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.xml @@ -54,4 +54,24 @@ WHERE mg.storagevehicle_code = #{vehicleCode} AND mg.`status` = #{groupStatus} + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/PmFormDataDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/PmFormDataDto.java index 1ff2935..d92b7b7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/PmFormDataDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/PmFormDataDto.java @@ -139,6 +139,8 @@ public class PmFormDataDto implements Serializable { * 关联上级表单id */ private String parent_id; + private String supp_name; + private String supp_code; private Boolean HasChildren=Boolean.FALSE; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java index a35fd7c..9e15e73 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java @@ -74,7 +74,7 @@ public class BackInTask extends AbstractTask { task.setExt_task_code(json.getString("task_code")); } task.setTask_code(CodeUtil.getNewCode("TASK_CODE")); - task.setTask_status(TaskStatus.CREATE.getCode()); + task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(json.getString("config_code")); task.setPoint_code1(json.getString("point_code1")); task.setPoint_code2(json.getString("point_code2")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java index 6938262..9f01f81 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java @@ -53,7 +53,7 @@ public class MoveTask extends AbstractTask { SchBaseTask task = new SchBaseTask(); task.setTask_id(IdUtil.getStringId()); task.setTask_code(CodeUtil.getNewCode("TASK_CODE")); - task.setTask_status(TaskStatus.CREATE.getCode()); + task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(json.getString("config_code")); task.setPoint_code1(json.getString("point_code1")); task.setPoint_code2(json.getString("point_code2")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java index 439da9b..706aeb5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java @@ -55,7 +55,7 @@ public class PdaPointTask extends AbstractTask { SchBaseTask task = new SchBaseTask(); task.setTask_id(IdUtil.getStringId()); task.setTask_code(CodeUtil.getNewCode("TASK_CODE")); - task.setTask_status(TaskStatus.CREATE.getCode()); + task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(json.getString("config_code")); task.setPoint_code1(json.getString("point_code1")); task.setPoint_code2(json.getString("point_code2")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java index d0c79d2..3c306a8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java @@ -46,7 +46,7 @@ public class StInTask extends AbstractTask { SchBaseTask task = new SchBaseTask(); task.setTask_id(IdUtil.getStringId()); task.setTask_code(json.getString("TaskCode")); - task.setTask_status(TaskStatus.CREATE.getCode()); + task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(json.getString("task_type")); task.setPoint_code1(json.getString("PickingLocation")); task.setPoint_code2(json.getString("PlacedLocation")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java index cc8a2dd..63a3d75 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java @@ -68,7 +68,7 @@ public class StOutTask extends AbstractTask { SchBaseTask task = new SchBaseTask(); task.setTask_id(IdUtil.getStringId()); task.setTask_code(json.getString("TaskCode")); - task.setTask_status(TaskStatus.CREATE.getCode()); + task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(json.getString("task_type")); task.setPoint_code1(json.getString("PickingLocation")); task.setPoint_code2(json.getString("PlacedLocation")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java index f597174..c46d4ad 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java @@ -81,7 +81,7 @@ public class VehicleInTask extends AbstractTask { } else { task.setTask_code(CodeUtil.getNewCode("TASK_CODE")); } - task.setTask_status(TaskStatus.CREATE.getCode()); + task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(json.getString("config_code")); task.setPoint_code1(json.getString("point_code1")); task.setPoint_code2(json.getString("point_code2")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java index a518942..4e26cf3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java @@ -72,7 +72,7 @@ public class VehicleOutTask extends AbstractTask { SchBaseTask task = new SchBaseTask(); task.setTask_id(IdUtil.getStringId()); task.setTask_code(json.getString("TaskCode")); - task.setTask_status(TaskStatus.CREATE.getCode()); + task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(json.getString("task_type")); task.setPoint_code1(json.getString("PickingLocation")); task.setPoint_code2(json.getString("PlacedLocation")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbBackAgvTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbBackAgvTask.java index 69e4c01..d3929f9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbBackAgvTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbBackAgvTask.java @@ -145,9 +145,6 @@ public class JbBackAgvTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbDownAgvTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbDownAgvTask.java index 6dd4629..bac1343 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbDownAgvTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbDownAgvTask.java @@ -62,7 +62,7 @@ public class JbDownAgvTask extends AbstractTask { SchBaseTask task = new SchBaseTask(); task.setTask_id(IdUtil.getStringId()); task.setTask_code(json.getString("TaskCode")); - task.setTask_status(TaskStatus.CREATE.getCode()); + task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(json.getString("task_type")); task.setPoint_code1(json.getString("point_code1")); task.setPoint_code2(json.getString("point_code2")); @@ -232,9 +232,6 @@ public class JbDownAgvTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbUpAgvTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbUpAgvTask.java index f9755de..4ddc3ac 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbUpAgvTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbUpAgvTask.java @@ -222,9 +222,6 @@ public class JbUpAgvTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java index 5a96fd3..03d6478 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java @@ -85,7 +85,7 @@ public class DownEmptyUpFullTask extends AbstractTask { if(json.containsKey("task_code")){ task.setExt_task_code(json.getString("task_code")); } - task.setTask_status(TaskStatus.CREATE.getCode()); + task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(json.getString("task_type")); task.setPoint_code1(json.getString("point_code1")); task.setPoint_code2(json.getString("point_code2")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java index a8082ce..7838df4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java @@ -88,7 +88,7 @@ public class InBillTask extends AbstractTask { SchBaseTask task = new SchBaseTask(); task.setTask_id(IdUtil.getStringId()); task.setTask_code(json.getString("task_code")); - task.setTask_status(TaskStatus.CREATE.getCode()); + task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(json.getString("config_code")); task.setPoint_code1(json.getString("point_code1")); task.setPoint_code2(json.getString("point_code2")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java index 4e3155a..cecc86a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java @@ -85,7 +85,7 @@ public class SeparateMaterialTask extends AbstractTask { if(json.containsKey("task_code")){ task.setExt_task_code(json.getString("task_code")); } - task.setTask_status(TaskStatus.CREATE.getCode()); + task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(json.getString("task_type")); task.setPoint_code1(json.getString("point_code1")); task.setPoint_code2(json.getString("point_code2")); diff --git a/lms/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue b/lms/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue index 63eac3b..72e8057 100644 --- a/lms/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue +++ b/lms/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue @@ -198,14 +198,14 @@ - - - + + + + + + + +