From 76b11c8451f6a94b2ccbb7a9c0cfc4496c606aff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com>
Date: Wed, 13 Nov 2024 15:12:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E5=8E=9F=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BpRawMaterialInController.java  |  9 +++++++++
 .../impl/BpProcureOrderServiceImpl.java        | 18 +++++++++++++++++-
 .../impl/BpRawMaterialInDetailServiceImpl.java |  1 +
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInController.java
index d37ba3498..c49bc0595 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInController.java
@@ -45,6 +45,15 @@ public class BpRawMaterialInController extends BaseController
     {
         startPage();
         List<BpRawMaterialIn> list = bpRawMaterialInService.selectBpRawMaterialInList(bpRawMaterialIn);
+        for (BpRawMaterialIn rawMaterialIn : list) {
+            double v1 = Double.parseDouble(rawMaterialIn.getUserDefined1());//安全库存
+            double v2 = rawMaterialIn.getAmountReal();//现有库存
+            if (v2-v1<0){
+                rawMaterialIn.setUserDefined2(Double.toString(Math.abs(v2-v1)));
+            }else {
+                rawMaterialIn.setUserDefined2(Double.toString(0));
+            }
+        }
         return getDataTable(list);
     }
 
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpProcureOrderServiceImpl.java
index 7c22e0179..943a0b062 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpProcureOrderServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpProcureOrderServiceImpl.java
@@ -1,6 +1,9 @@
 package com.op.wms.service.impl;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Random;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
@@ -67,7 +70,20 @@ public class BpProcureOrderServiceImpl implements IBpProcureOrderService
         bpProcureOrder.setID(IdUtils.fastSimpleUUID());
         BaseProduct baseProduct = baseProductMapper.selectBaseProductByProductName(bpProcureOrder.getMaterialName());
         bpProcureOrder.setMaterialCode(baseProduct.getProductCode());
-        AtomicInteger SEQUENCE = new AtomicInteger(101923);
+
+        Random random = new Random();
+        Set<Integer> set = new HashSet<>();
+
+        while (set.size() < 6) {
+            int digit = random.nextInt(10); // 生成一个0到9之间的随机数
+            set.add(digit); // 加入到Set集合中，Set会自动处理重复问题
+        }
+
+        StringBuilder uniqueNumber = new StringBuilder();
+        for (int num : set) {
+            uniqueNumber.append(num);
+        }
+        AtomicInteger SEQUENCE = new AtomicInteger(Integer.parseInt( uniqueNumber.toString()));
         // 生成序列号，确保唯一性
         int sequence = SEQUENCE.getAndIncrement();
 
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpRawMaterialInDetailServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpRawMaterialInDetailServiceImpl.java
index c53e5356c..94d529250 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpRawMaterialInDetailServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpRawMaterialInDetailServiceImpl.java
@@ -65,6 +65,7 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS
     @DS("#header.poolName")
     public List<BpRawMaterialInDetail> selectBpRawMaterialInDetailList(BpRawMaterialInDetail bpRawMaterialInDetail)
     {
+
         return bpRawMaterialInDetailMapper.selectBpRawMaterialInDetailList(bpRawMaterialInDetail);
     }