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

rev：测试修改

Browse Source
This commit is contained in:
liuxy
2025-10-16 13:40:32 +08:00
parent 2047b6b167
commit 13dcfda0f7
13 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
View File

@@ -125,22 +125,22 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
public BaseResponse resultCar(JSONObject whereJson) {
log.info("ACS向WMS反馈任务车号，请求参数：--------------------------------------" + whereJson.toString());
// 任务标识
String task_id = whereJson.getString("task_id");
String task_code = whereJson.getString("task_code");
// 车号
String car_no = whereJson.getString("car_no");
if (ObjectUtil.isEmpty(car_no)) {
throw new BadRequestException("车号不能为空！");
}
RLock lock = redissonClient.getLock(task_id);
RLock lock = redissonClient.getLock(task_code);
boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
try {
if (tryLock) {
SchBaseTask taskObj = iSchBaseTaskService.getById(task_id);
SchBaseTask taskObj = iSchBaseTaskService.getByCode(task_code);
taskObj.setCar_no(car_no);
iSchBaseTaskService.updateById(taskObj);
} else {
throw new BadRequestException("任务标识为：" + task_id + "的任务正在操作中！");
throw new BadRequestException("任务编码为：" + task_code + "的任务正在操作中！");
}
} finally {
if (tryLock) {
@@ -181,7 +181,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
AbstractTask task = taskFactory.getTask(taskDao.getConfig_code());
JSONObject resultWeigh = task.resultWeigh(taskDao);
//调用相机服务保存照片
HikvisionSnapshotUtil.sync截图(vehicleDao.getStoragevehicle_code(),taskDao.getTask_code());
// TODO HikvisionSnapshotUtil.sync截图(vehicleDao.getStoragevehicle_code(),taskDao.getTask_code());
log.info("ACS向WMS反馈重量，返回参数：--------------------------------------" + BaseResponse.responseOk(resultWeigh).toString());
return BaseResponse.responseOk(resultWeigh);
}

18
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java
View File

@@ -7,17 +7,21 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.ext.service.WmsToAcsService;
import org.nl.wms.ext.service.util.AcsResponse;
import org.nl.wms.sch_manage.enums.TaskStatus;
import org.nl.wms.sch_manage.service.ISchBasePointService;
import org.nl.wms.sch_manage.service.ISchBaseTaskService;
import org.nl.wms.sch_manage.service.dao.SchBasePoint;
import org.nl.wms.sch_manage.service.dao.SchBaseTask;
import org.nl.wms.warehouse_management.enums.IOSConstant;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -43,6 +47,12 @@ public abstract class AbstractTask {
@Autowired
private WmsToAcsService wmsToAcsService;
/**
* 点位服务
*/
@Resource
private ISchBasePointService iSchBasePointService;
/**
* 任务创建
* 根据配置生成任务
@@ -153,6 +163,14 @@ public abstract class AbstractTask {
this.updateStatus(taskCode, status);
}
public void executingTask(SchBaseTask taskObj) {
iSchBasePointService.update(
new UpdateWrapper<SchBasePoint>().lambda()
.eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2())
.set(SchBasePoint::getIng_task_code, taskObj.getTask_id())
);
}
/**
* 以下改为public会出现自动注入类出现问题
*

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackOutTask.java
View File

@@ -157,6 +157,7 @@ public class BackOutTask extends AbstractTask {
}
// 根据传来的类型去对任务进行操作
if (status.equals(TaskStatus.EXECUTING)) {
this.executingTask(taskObj);
taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
taskObj.setRemark("执行中");
taskService.updateById(taskObj);

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java
View File

@@ -135,6 +135,7 @@ public class CheckMoveTask extends AbstractTask {
// 根据传来的类型去对任务进行操作
if (status.equals(TaskStatus.EXECUTING)) {
// 更新明细状态
this.executingTask(taskObj);
taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
taskObj.setRemark("执行中");
taskService.updateById(taskObj);

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxMoveTask.java
View File

@@ -152,6 +152,7 @@ public class CombinedBoxMoveTask extends AbstractTask {
if (status.equals(TaskStatus.EXECUTING)) {
// 更新明细状态
iStIvtMoveinvService.executing(taskObj);
this.executingTask(taskObj);
taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
taskObj.setRemark("执行中");
taskService.updateById(taskObj);

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java
View File

@@ -127,6 +127,7 @@ public class EmpVehicleOutTask extends AbstractTask {
// 根据传来的类型去对任务进行操作
if (status.equals(TaskStatus.EXECUTING)) {
// 更新明细状态
this.executingTask(taskObj);
taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
taskObj.setRemark("执行中");
taskService.updateById(taskObj);

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java
View File

@@ -140,6 +140,7 @@ public class HandOutTask extends AbstractTask {
}
// 根据传来的类型去对任务进行操作
if (status.equals(TaskStatus.EXECUTING)) {
this.executingTask(taskObj);
taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
taskObj.setRemark("执行中");
taskService.updateById(taskObj);

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HotOutTask.java
View File

@@ -148,6 +148,7 @@ public class HotOutTask extends AbstractTask {
}
// 根据传来的类型去对任务进行操作
if (status.equals(TaskStatus.EXECUTING)) {
this.executingTask(taskObj);
taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
taskObj.setRemark("执行中");
taskService.updateById(taskObj);

4
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java
View File

@@ -242,7 +242,7 @@ public class PdaPointTask extends AbstractTask {
iSchBasePointService.update(
new UpdateWrapper<SchBasePoint>().lambda()
.eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())
.set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("无货"))
.set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位"))
);
iStructattrService.update(
new UpdateWrapper<Structattr>().lambda()
@@ -253,7 +253,7 @@ public class PdaPointTask extends AbstractTask {
iSchBasePointService.update(
new UpdateWrapper<SchBasePoint>().lambda()
.eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2())
.set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("无货"))
.set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位"))
);
iStructattrService.update(
new UpdateWrapper<Structattr>().lambda()

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxMoveTask.java
View File

@@ -154,6 +154,7 @@ public class PieceBoxMoveTask extends AbstractTask {
// 根据传来的类型去对任务进行操作
if (status.equals(TaskStatus.EXECUTING)) {
// 更新明细状态
this.executingTask(taskObj);
iStIvtMoveinvService.executing(taskObj);
taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
taskObj.setRemark("执行中");

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/QualityOutTask.java
View File

@@ -131,6 +131,7 @@ public class QualityOutTask extends AbstractTask {
}
// 根据传来的类型去对任务进行操作
if (status.equals(TaskStatus.EXECUTING)) {
this.executingTask(taskObj);
taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
taskObj.setRemark("执行中");
taskService.updateById(taskObj);

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ReceiveOutTask.java
View File

@@ -148,6 +148,7 @@ public class ReceiveOutTask extends AbstractTask {
}
// 根据传来的类型去对任务进行操作
if (status.equals(TaskStatus.EXECUTING)) {
this.executingTask(taskObj);
taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
taskObj.setRemark("执行中");
taskService.updateById(taskObj);

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/SelectOutServiceImpl.java
View File

@@ -137,7 +137,7 @@ public class SelectOutServiceImpl extends ServiceImpl<IOStorInvDtlMapper, IOStor
// 扣除载具重量
double sub_qty = NumberUtil.sub(weigh_qty, vehicleDao.getWeigth().doubleValue());
// 计算拣选重量： 出库重量 - 称重重量（扣除载具重量）
double select_qty = NumberUtil.sub(whereJson.getDoubleValue("plan_qty"), sub_qty);
double select_qty = NumberUtil.sub(whereJson.getDoubleValue("check_qty"), sub_qty);
JSONObject result = new JSONObject();
result.put("weigh_qty", NumberUtil.round(sub_qty, 2));