diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java index 7393de2..857761e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java @@ -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(""); 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 8a59550..5249836 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 @@ -315,6 +315,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") .and(ll -> ll.like(SchBaseTask::getPoint_code1, pointCode).or() .like(SchBaseTask::getPoint_code2, pointCode).or() .like(SchBaseTask::getPoint_code3, pointCode).or() diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java index 9eed9a8..f56aa31 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java @@ -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()); diff --git a/lms/nladmin-ui/src/views/wms/statement/record/report.vue b/lms/nladmin-ui/src/views/wms/statement/record/report.vue new file mode 100644 index 0000000..35167ef --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/statement/record/report.vue @@ -0,0 +1,599 @@ + + + + +