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; - - -/** - *

- * 组桶 控制层 - *

- * - * @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 getBucketInfoByBucket(String vehicleCode) { return this.baseMapper.getBucketInfoByBucket(vehicleCode); @@ -59,7 +67,8 @@ public class MdPdGroupbucketServiceImpl extends ServiceImpl confirmPalletAssembly(@RequestBody @Valid AssemblyPalletParam param) { return new ResponseEntity<>(pdaCommonService.confirmPalletAssembly(param), HttpStatus.OK); } - @PostMapping("/byBuckCode") - @Log("物料组桶-获取桶号") + @PostMapping("/queryRecordNoBucked") + @Log("物料组桶-查询证书编号") @SaIgnore - public ResponseEntity byBuckCode(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(pdaCommonService.byBuckCode(whereJson), HttpStatus.OK); + public ResponseEntity 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 infoByBucket = groupbucketService.getBucketInfoByBucket(param.getBucket_code()); + String bucket_code = param.getBucket_code(); + // 查询桶码是否存在 + storagevehicleinfoService.getByCode(bucket_code); + + List 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 - + @@ -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' }