From 113a5186e68e2e3bcd8e8e1516db297b0c6edaba Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Wed, 26 Oct 2022 17:14:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/bill/service/impl/RegionIoServiceImpl.java | 5 +++-- lms/nladmin-ui/src/views/wms/sch/task/index.vue | 14 +++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/impl/RegionIoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/impl/RegionIoServiceImpl.java index 1b4c618..8a910fc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/impl/RegionIoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/impl/RegionIoServiceImpl.java @@ -151,14 +151,15 @@ public class RegionIoServiceImpl implements RegionIoService { for (int i = 0; i < dto.size(); i++) { JSONObject dtoJSONObject = dto.getJSONObject(i); JSONObject iostorinv = regionIoTab.query("iostorinv_id = '" + dtoJSONObject.getString("iostorinv_id") + "'").uniqueResult(0); - if (ObjectUtil.equal(iostorinv.getString("bill_status"), "3")) continue; // 已完成的单据不在继续 + if (ObjectUtil.equal(iostorinv.getString("bill_status"), "3")) + throw new BadRequestException("没有单据或者已出库"); JSONObject param = new JSONObject(); param.put("point_code1", dtoJSONObject.getString("start_point_code")); param.put("vehicle_code", dtoJSONObject.getString("vehicle_code")); // param.put("vehicle_type", vehicle_type); param.put("iostorinv_id", dtoJSONObject.getString("iostorinv_id")); CpOutTask taskBean = SpringContextHolder.getBean(CpOutTask.class); -// String task_id = taskBean.createTask(param); + String task_id = taskBean.createTask(param); } } diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue index 1ba6fd0..6cf2d34 100644 --- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue @@ -117,12 +117,20 @@ - + + + - + + + @@ -197,7 +205,7 @@ import crudClassstandard from '@/api/wms/basedata/classstandard' export default { name: 'Task', - dicts: [], + dicts: ['acs_task_type', 'vehicle_type'], components: { pagination, crudOperation, rrOperation, Treeselect, udOperation },