白坯原材料入库优化

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);
     }
 

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();
 

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);
     }