From 0857a632855c95a6ce70fd9a672affca0ca6135d Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Wed, 26 Oct 2022 15:18:57 +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

---
 .../st/set/service/impl/FinishedProductServiceImpl.java  | 9 ++++++++-
 .../nl/wms/pcs/service/impl/ReceivemstServiceImpl.java   | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/FinishedProductServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/FinishedProductServiceImpl.java
index c3ce0878..af0fc327 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/FinishedProductServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/FinishedProductServiceImpl.java
@@ -163,7 +163,14 @@ public class FinishedProductServiceImpl implements FinishedProductService {
                 bucketObj.put("create_time", DateUtil.now());
                 bucketObj.put("print_type", "01");
                 bucketObj.put("pcsn", pcsn);
-                bucketRecordTable.insert(bucketObj);
+                //查询有没有桶记录
+                JSONObject bucketJo2 = bucketRecordTable.query("bucketunique='" + bucketunique + "'").uniqueResult(0);
+                //假如有记录就更新
+                if(bucketJo2 == null){
+                    bucketRecordTable.insert(bucketObj);
+                }else{
+                    throw new PdaRequestException("桶码为'" + bucketunique + "'的记录已存在，不允许重复插入！");
+                }
                 list.add(bucketunique);
             }
             JSONObject changeObj = new JSONObject();
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ReceivemstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ReceivemstServiceImpl.java
index bf779bb4..f9227f87 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ReceivemstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ReceivemstServiceImpl.java
@@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.exception.BadRequestException;
 import org.nl.modules.security.service.dto.JwtUserDto;
 import org.nl.modules.system.util.CodeUtil;
+import org.nl.pda.exception.PdaRequestException;
 import org.nl.utils.FileUtil;
 import org.nl.utils.SecurityUtils;
 import org.nl.wms.basedata.master.constant.MaterOptTypeEnum;
@@ -435,7 +436,13 @@ public class ReceivemstServiceImpl implements ReceivemstService {
             jsonBuc.put("create_id", SecurityUtils.getCurrentUserId());
             jsonBuc.put("create_name", SecurityUtils.getNickName());
             jsonBuc.put("create_time", DateUtil.now());
-            bucTab.insert(jsonBuc);
+            //查询有没有桶记录
+            JSONObject bucketJo2 = bucTab.query("bucketunique='" + jsonBuc.getString("bucketunique") + "'").uniqueResult(0);
+            if(bucketJo2 == null){
+                bucTab.insert(jsonBuc);
+            }else{
+                throw new PdaRequestException("桶码为'" + jsonBuc.getString("bucketunique") + "'的记录已存在，不允许重复插入！");
+            }
             //返回创建的每条记录 用于打印二维码
             JSONObject jsonMater = WQLObject.getWQLObject("md_me_materialbase").query("material_id = '" + MapUtil.getStr(whereJson, "material_id") + "'").uniqueResult(0);
             jsonBuc.put("material_name", jsonMater.getString("material_name"));