From 61b8d260e3a5377858e3158e9c8c00384b73962a Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Wed, 14 Jan 2026 14:25:01 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=B5=8B=E8=AF=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GroupBucketController.java     | 29 -------------------
 .../impl/MdPdGroupbucketServiceImpl.java      | 11 ++++++-
 .../controller/PdaCommonController.java       |  8 ++---
 .../service/PdaCommonService.java             |  9 ------
 .../service/impl/PdaCommonServiceImpl.java    | 16 +++++-----
 .../enums/IOSConstant.java                    |  5 ++++
 .../impl/MdPbGroupplateServiceImpl.java       |  8 +++++
 .../src/views/wms/basedata/bucked/index.vue   |  6 ++--
 8 files changed, 37 insertions(+), 55 deletions(-)
 delete mode 100644 wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupBucketController.java

diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupBucketController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupBucketController.java
deleted file mode 100644
index d6e32e9..0000000
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupBucketController.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.nl.wms.basedata_manage.controller;
-
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.basedata_manage.service.IMdPdGroupbucketService;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-
-/**
- * <p>
- * 组桶 控制层
- * </p>
- *
- * @author Liuxy
- * @since 2025-11-24
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/api/groupBucket")
-@Slf4j
-public class GroupBucketController {
-
-    @Resource
-    private final IMdPdGroupbucketService iMdPdGroupbucketService;
-}
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPdGroupbucketServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPdGroupbucketServiceImpl.java
index e3a4473..bfcec9b 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPdGroupbucketServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPdGroupbucketServiceImpl.java
@@ -10,6 +10,7 @@ import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.basedata_manage.service.IMdPbMeasureunitService;
+import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService;
 import org.nl.wms.basedata_manage.service.IMdPdGroupbucketService;
 import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit;
 import org.nl.wms.basedata_manage.service.dao.MdPdGroupbucket;
@@ -18,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +42,12 @@ public class MdPdGroupbucketServiceImpl extends ServiceImpl<MdPdGroupbucketMappe
     @Autowired
     private IMdPbMeasureunitService iMdPbMeasureunitService;
 
+    /**
+     * 载具服务
+     */
+    @Resource
+    private IMdPbStoragevehicleinfoService storagevehicleinfoService;
+
     @Override
     public List<JSONObject> getBucketInfoByBucket(String vehicleCode) {
         return this.baseMapper.getBucketInfoByBucket(vehicleCode);
@@ -59,7 +67,8 @@ public class MdPdGroupbucketServiceImpl extends ServiceImpl<MdPdGroupbucketMappe
     @Override
     @Transactional
     public void create(MdPdGroupbucket dto) {
-        dto.setBucket_code(CodeUtil.getNewCode("BUCKED_CODE"));
+        // 查询桶码是否存在
+        storagevehicleinfoService.getByCode(dto.getBucket_code());
         dto.setId(IdUtil.getStringId());
         dto.setCreate_id(SecurityUtils.getCurrentUserId());
         dto.setCreate_name(SecurityUtils.getCurrentNickName());
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java
index 4ccafd9..2cf68ee 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java
@@ -92,11 +92,11 @@ public class PdaCommonController {
     public ResponseEntity<Object> confirmPalletAssembly(@RequestBody @Valid AssemblyPalletParam param) {
         return new ResponseEntity<>(pdaCommonService.confirmPalletAssembly(param), HttpStatus.OK);
     }
-    @PostMapping("/byBuckCode")
-    @Log("物料组桶-获取桶号")
+    @PostMapping("/queryRecordNoBucked")
+    @Log("物料组桶-查询证书编号")
     @SaIgnore
-    public ResponseEntity<Object> byBuckCode(@RequestBody JSONObject whereJson) {
-        return new ResponseEntity<>(pdaCommonService.byBuckCode(whereJson), HttpStatus.OK);
+    public ResponseEntity<Object> queryRecordNoBucked(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaCommonService.queryRecordNo(whereJson), HttpStatus.OK);
     }
     @PostMapping("/confirmBucketAssembly")
     @Log("物料组桶-组桶")
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java
index f6b0fe0..b43a7f9 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java
@@ -78,13 +78,4 @@ public interface PdaCommonService {
      * @return PdaResponse
      */
     PdaResponse byBagCodeInfo(JSONObject whereJson);
-
-    /**
-     * 物料组桶-获取桶号
-     * @param whereJson {
-     *                  bag_code: 袋码
-     * }
-     * @return PdaResponse
-     */
-    PdaResponse byBuckCode(JSONObject whereJson);
 }
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java
index e2bd31f..daa1b8b 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java
@@ -18,6 +18,7 @@ import org.nl.system.service.dict.ISysDictService;
 import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService;
 import org.nl.wms.basedata_manage.service.IMdPdGroupbucketService;
 import org.nl.wms.basedata_manage.service.IStructattrService;
+import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo;
 import org.nl.wms.basedata_manage.service.dao.MdPdGroupbucket;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
 import org.nl.wms.pda.general_management.service.PdaCommonService;
@@ -45,6 +46,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -203,7 +205,11 @@ public class PdaCommonServiceImpl implements PdaCommonService {
 
     @Override
     public PdaResponse confirmBucketAssembly(AssemblyBucketParam param) {
-        List<JSONObject> infoByBucket = groupbucketService.getBucketInfoByBucket(param.getBucket_code());
+        String bucket_code = param.getBucket_code();
+        // 查询桶码是否存在
+        storagevehicleinfoService.getByCode(bucket_code);
+
+        List<JSONObject> infoByBucket = groupbucketService.getBucketInfoByBucket(bucket_code);
         if (infoByBucket.size() > 0) {
             throw new BadRequestException("该桶已绑定过！");
         }
@@ -296,12 +302,4 @@ public class PdaCommonServiceImpl implements PdaCommonService {
         result.put("bag_code", bag_code);
         return PdaResponse.requestParamOk(result);
     }
-
-    @Override
-    public PdaResponse byBuckCode(JSONObject whereJson) {
-        String bucket_code = CodeUtil.getNewCode("BUCKED_CODE");
-        JSONObject result = new JSONObject();
-        result.put("bucket_code", bucket_code);
-        return PdaResponse.requestParamOk(result);
-    }
 }
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java
index dffa363..f76b1ab 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java
@@ -107,4 +107,9 @@ public class IOSConstant {
      */
     public final static String NBC001 = "NBC001";
 
+    /**
+     * 分类编码：原料称量
+     */
+    public final static String CL001 = "CL001";
+
 }
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java
index 8bec7e7..d15b1e7 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java
@@ -237,12 +237,20 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper,
         MdMeMaterialbase materDao = iMdMeMaterialbaseService.getById(material_id);
         // 查询分类
         MdPbClassstandard classDao = iMdPbClassstandardService.getById(materDao.getMaterial_type_id());
+        if (ObjectUtil.isEmpty(classDao)) {
+            throw new BadRequestException("请先配置该物料的物料分类!");
+        }
+
         String class_code = classDao.getClass_code();
         switch (class_code) {
             case IOSConstant.YL001:
                 // 原料
                 bag_code = CodeUtil.getNewCode("CLASS_CODE_YL");
                 break;
+            case IOSConstant.CL001:
+                // 原料称量
+                bag_code = CodeUtil.getNewCode("CLASS_CODE_YL");
+                break;
             case IOSConstant.FL001:
                 // 辅料
                 bag_code = CodeUtil.getNewCode("CLASS_CODE_FL");
diff --git a/wms/nladmin-ui/src/views/wms/basedata/bucked/index.vue b/wms/nladmin-ui/src/views/wms/basedata/bucked/index.vue
index cc87833..7d0ab28 100644
--- a/wms/nladmin-ui/src/views/wms/basedata/bucked/index.vue
+++ b/wms/nladmin-ui/src/views/wms/basedata/bucked/index.vue
@@ -102,7 +102,7 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="桶码" prop="bucket_code">
-                <el-input v-model="form.bag_code" disabled placeholder="系统生成" style="width: 200px;" />
+                <el-input v-model="form.bucket_code" :disabled="crud.status.edit > 0" style="width: 200px;" />
               </el-form-item>
             </el-col>
 
@@ -228,8 +228,8 @@ export default {
         material_code: [
           { required: true, message: '物料不能为空', trigger: 'blur' }
         ],
-        vehicle_code: [
-          { required: true, message: '载具不能为空', trigger: 'blur' }
+        bucket_code: [
+          { required: true, message: '桶码不能为空', trigger: 'blur' }
         ],
         pcsn: [
           { required: true, message: '批次不能为空', trigger: 'blur' }