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

opt: 任务托盘码修正、出入库分配的时候不在操作Qty字段

Browse Source
This commit is contained in:
liyongde
2025-08-11 09:49:23 +08:00
parent 1387b31ba5
commit 7328d5cc7a
4 changed files with 603 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java
View File

@@ -125,7 +125,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
.eq(SchBasePoint::getRegion_code, ddjbj.getRegion_code())
.eq(SchBasePoint::getPoint_type, "4"));
outPoint.setPoint_status("2");
outPoint.setVehicle_code(inPoint.getPoint_code());
outPoint.setVehicle_code(inPoint.getVehicle_code());
outPoint.setUpdate_time(DateUtil.now());
inPoint.setPoint_status("1");
inPoint.setVehicle_code("");

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java
View File

@@ -315,6 +315,7 @@ public class PdaJBServiceImpl implements PdaJBService {
List<SchBaseTask> list = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
.lt(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode())
.eq(SchBaseTask::getIs_delete, false)
.eq(SchBaseTask::getTask_code, "JbDownAgvTask")
.and(ll -> ll.like(SchBaseTask::getPoint_code1, pointCode).or()
.like(SchBaseTask::getPoint_code2, pointCode).or()
.like(SchBaseTask::getPoint_code3, pointCode).or()

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java
View File

@@ -164,7 +164,7 @@ public class UpdateIvtUtils {
}
// 加冻结数
double frozen_qty = NumberUtil.add(extDao.getFrozen_qty(), where.getDoubleValue("change_qty")).doubleValue();
extDao.setQty(BigDecimal.valueOf(canuse_qty));
// extDao.setQty(BigDecimal.valueOf(canuse_qty));
extDao.setFrozen_qty(BigDecimal.valueOf(frozen_qty));
extDao.setUpdate_id(SecurityUtils.getCurrentUserId());
extDao.setUpdate_name(SecurityUtils.getCurrentNickName());
@@ -232,7 +232,7 @@ public class UpdateIvtUtils {
// 加可用
// double canuse_qty = NumberUtil.add(extDao.getQty(), where.getDoubleValue("change_qty")).doubleValue();
extDao.setFrozen_qty(BigDecimal.ZERO);
extDao.setQty(BigDecimal.valueOf(qty));
// extDao.setQty(BigDecimal.valueOf(qty));
extDao.setUpdate_id(SecurityUtils.getCurrentUserId());
extDao.setUpdate_name(SecurityUtils.getCurrentNickName());
extDao.setUpdate_time(DateUtil.now());