From 8df387a7ba32a9462675afa98ae13081f55c9018 Mon Sep 17 00:00:00 2001 From: DOUDOU <877258667@qq.com> Date: Mon, 26 Dec 2022 09:18:22 +0800 Subject: [PATCH] =?UTF-8?q?09---=E3=80=8BS=20=20=E8=BD=A6=E9=97=B4?= =?UTF-8?q?=E4=BB=93=E5=BA=93=2003---=E3=80=8B=E5=B7=B2=E5=85=A5=E5=BA=93?= =?UTF-8?q?=20=20I=20=E6=8C=89=E7=85=A7=E7=8E=8B=E6=80=BB=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/service/impl/SplitServiceImpl.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gaotao/modules/pda/service/impl/SplitServiceImpl.java b/src/main/java/com/gaotao/modules/pda/service/impl/SplitServiceImpl.java index 8a55877..4e58dd5 100644 --- a/src/main/java/com/gaotao/modules/pda/service/impl/SplitServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pda/service/impl/SplitServiceImpl.java @@ -123,6 +123,7 @@ public class SplitServiceImpl implements SplitService { session.setAttribute("splitRollNos", splitRollNos); session.setAttribute("splitRollCounts", splitRollCounts); session.setAttribute("splitRollList", splitRollList); + session.setAttribute("splitRollPartNo", partNo); session.setAttribute("splitToSap", splitToSap); } //获取session中卷号的列表 @@ -138,6 +139,12 @@ public class SplitServiceImpl implements SplitService { logger.info("生产订单号码不一致!当前的卷号为：" + rollNo +"当前的订单号："+orderNo); throw new RuntimeException("生产订单号码不一致,请重新扫描!"); } + String currentPartNo = String.valueOf(session.getAttribute("splitRollPartNo")); + //验证物料号是否一致 + if(!currentPartNo.equals(partNo)){ + logger.info("物料编码不一致!当前的卷号为：" + currentPartNo +"扫描卷的物料编码："+partNo); + throw new RuntimeException("物料编码不一致,请重新扫描!"); + } // 缓存卷号信息防止二次扫码 splitRollNos.put(rollNo, rollNo); @@ -521,8 +528,15 @@ public class SplitServiceImpl implements SplitService { errorStatusRollNos.add(str); }else{ FPRollsOutData temp = fg_rollMap.get(str); - temp.setStatus("已入库"); - temp.setStatusDb("I"); + //09---》S 车间仓库 03---》已入库 I + // 09 和 03 + if("09".equals(depot)){ + temp.setStatus("车间仓库"); + temp.setStatusDb("S"); + }else{ + temp.setStatus("已入库"); + temp.setStatusDb("I"); + } scanedRolls.add(temp); } }