From cb4af89f29f3e83ebb4b67b05ecd9658b1f98182 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Fri, 28 Oct 2022 14:14:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java | 5 ----- .../wms/st/instor/service/impl/HandMoveStorServiceImpl.java | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java index 49f6e69a..27d24646 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java @@ -799,11 +799,6 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService { } //生成移库单(调用pc的移库单据) - - - String moveinv_id = IdUtil.getSnowflake(1, 1).nextId() + ""; - String moveinvdtl_id = IdUtil.getSnowflake(1, 1).nextId() + ""; - String bill_code = CodeUtil.getNewCode("MOVE_CODE"); int seq_no = 1; String task_id = IdUtil.getSnowflake(1, 1).nextId() + ""; //根据其中一种物料寻找一个合适的仓位 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java index 5189331e..50865d34 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java @@ -190,6 +190,10 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { HashMap row = rows.get(i); JSONObject jo_row = (JSONObject) JSONObject.toJSON(row); String storagevehicle_code = row.get("storagevehicle_code"); + JSONObject now_jo = wo_dtl.query("work_status<>'99' and storagevehicle_code='"+storagevehicle_code+"'").uniqueResult(0); + if(now_jo!=null){ + throw new BadRequestException("当前载具:"+storagevehicle_code+"已生成移库单，请稍后再试！"); + } if (i == 0){ ids.append("'"); }