diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java index 13ebc5b48..059f80d27 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java @@ -32,6 +32,9 @@ public class PointStatusServiceImpl implements PointStatusService { if (StrUtil.isEmpty(container_name)) { throw new BadRequestException("空轴/母卷不能为空！"); } + + //查询该编码是否属于母卷 + JSONObject raw_jo = WQLObject.getWQLObject("pdm_bi_rawfoilworkorder").query("container_name = '"+container_name+" AND is_delete = '0'").uniqueResult(0); //查询该点对应的是什么位置 JSONObject cut_point = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("full_point_code = '" + point_code + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(cut_point)) { @@ -39,6 +42,9 @@ public class PointStatusServiceImpl implements PointStatusService { if (StrUtil.isNotEmpty(now_container_name)) { throw new BadRequestException("该点位上已存在母卷，不能进行绑定！"); } + if (ObjectUtil.isEmpty(raw_jo)){ + throw new BadRequestException("请输入正确的母卷号！"); + } cut_point.put("container_name", container_name); cut_point.put("full_point_status", "02"); } else { @@ -48,6 +54,9 @@ public class PointStatusServiceImpl implements PointStatusService { if (StrUtil.isNotEmpty(empty_vehicle_code)) { throw new BadRequestException("该点位上已存在空轴，不能进行绑定！"); } + if (ObjectUtil.isNotEmpty(raw_jo)){ + throw new BadRequestException("请输入正确的空轴号！"); + } cut_point.put("empty_vehicle_code", container_name); cut_point.put("empty_point_status", "02"); } else { @@ -66,10 +75,6 @@ public class PointStatusServiceImpl implements PointStatusService { } else { cut_point = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("empty_point_code = '" + point_code + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(cut_point)) { - String empty_vehicle_code = cut_point.getString("empty_vehicle_code"); - if (StrUtil.isNotEmpty(empty_vehicle_code)) { - throw new BadRequestException("该点位上已存在空轴，不能进行绑定！"); - } cut_point.put("empty_vehicle_code", ""); cut_point.put("empty_point_status", "01"); } else { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java index 3a67c4ee9..28952c6ca 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.wms.pda.st.service.impl; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -62,7 +63,6 @@ public class ProductInstorServiceImpl implements ProductInstorService { JSONArray box_rows = whereJson.getJSONArray("box_rows"); - JSONArray rows = new JSONArray(); HashMap map = new HashMap<>(); map.put("box_no",box_no); if (option.equals("1")){ @@ -75,11 +75,30 @@ public class ProductInstorServiceImpl implements ProductInstorService { //如果是入虚拟库直接入库并确认，如果是入成品库则生成入库单，生成一个二楼去一楼的任务 JSONObject mst_jo = new JSONObject(); mst_jo.put("tableData",box_rows); - mst_jo.put("bill_type",box_rows); + mst_jo.put("biz_date", DateUtil.now()); + if (option.equals("1")){ + mst_jo.put("bill_type","0003"); + } + if (option.equals("2")){ + mst_jo.put("bill_type","0001"); + } + if (option.equals("3")){ + mst_jo.put("bill_type","0002"); + } + //查询成品库仓库 + JSONObject stor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("is_delete = '0' AND is_used = '1' AND is_productstore = '1'").uniqueResult(0); + mst_jo.put("stor_id",stor.getString("stor_id")); + mst_jo.put("detail_count",box_rows.size()); + mst_jo.put("total_qty","0"); + mst_jo.put("bill_status","10"); + rawAssistIStorService.insertDtl(mst_jo); + //判断是否虚拟 + if (!is_virtual.equals("1")){ + //创建二楼去一楼的任务 + } JSONObject jo = new JSONObject(); - jo.put("data",rows); - jo.put("message","查询成功！"); + jo.put("message","确认成功！"); return jo; } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index b7b756b7c..e965fb4e8 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue index 2aa815bdc..51722262b 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue @@ -232,6 +232,7 @@ +