From 1ba0dbfde5634c8bf2ec20891d6b226b996f6b59 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 02 九月 2026 14:24:38 +0800
Subject: [PATCH] refactor(mes): 优化MES生产扫码入库功能支持多类型扫码
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java | 239 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 223 insertions(+), 16 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java
index 60b78c1..492d1d0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java
@@ -1,41 +1,117 @@
package cn.iocoder.yudao.module.mes.service.qc.seedquality;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualitySubmitReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.bagcode.MesProBagCodeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.batch.MesProBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.seedquality.*;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.bagcode.MesProBagCodeMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.seedquality.*;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.batch.MesWmBatchMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock.MesWmMaterialStockMapper;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstockbag.MesWmMaterialStockBagDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstockbag.MesWmMaterialStockBagMapper;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProBagCodeQcStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmStockStateEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmWarehouseTypeEnum;
import cn.iocoder.yudao.module.mes.service.pro.batch.MesProBatchService;
-import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
-import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
+import cn.iocoder.yudao.module.mes.service.wm.materialstockbag.MesWmMaterialStockBagService;
+import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
+import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.jdbc.BadSqlGrammarException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_QUALIFIED_WAREHOUSE_NOT_CONFIGURED;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_WAREHOUSE_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_WAREHOUSE_TYPE_NOT_QUALIFIED;
@Service @Validated @Slf4j
public class MesQcSeedQualityServiceImpl implements MesQcSeedQualityService {
private static final Set<String> REQUIRED = Set.of("purity", "cleanliness", "germination_rate", "moisture");
@Resource private MesQcSeedQualityMapper qualityMapper;
@Resource private MesQcSeedQualityIndicatorMapper indicatorMapper;
+ @Resource private MesProBagCodeMapper bagCodeMapper;
@Resource private MesProBatchService proBatchService;
- @Resource private MesWmBatchService mesWmBatchService;
- @Resource private MesWmMaterialStockService materialStockService;
+ @Resource private MesWmBatchMapper mesWmBatchMapper;
+ @Resource private MesWmMaterialStockMapper materialStockMapper;
+ @Resource private MesWmMaterialStockBagMapper materialStockBagMapper;
+ @Resource private MesWmMaterialStockBagService materialStockBagService;
+ @Resource private MesWmTransactionService wmTransactionService;
+ @Resource private MesWmWarehouseService warehouseService;
+ @Resource private MesWmWarehouseLocationService warehouseLocationService;
+ @Resource private MesWmWarehouseAreaService warehouseAreaService;
+
+ @Override
+ public PageResult<MesQcSeedQualityDO> getQualityPage(MesQcSeedQualityPageReqVO reqVO) {
+ return qualityMapper.selectPage(reqVO);
+ }
@Override @Transactional(rollbackFor = Exception.class)
public Long submit(MesQcSeedQualitySubmitReqVO reqVO) {
if (reqVO.getIndicators().size() != 4) throw new IllegalArgumentException("蹇呴』鎻愪氦鍥涢」鎸囨爣");
if (qualityMapper.selectByCode(reqVO.getCode()) != null) throw new IllegalArgumentException("璇ヨ鐮佸凡璐ㄦ锛岀姝㈤噸澶嶆彁浜�");
+ // 绉嶅瓙璐ㄦ蹇呴』浠ヨ鐮侊紙鍗曡锛夋彁浜わ紝鐗╂枡淇℃伅鐢辫鐮佽嚜鍔ㄨВ鏋愶紝鍓嶇涓嶅啀鍗曠嫭閫夋嫨鐗╂枡
+ MesProBagCodeDO bag = bagCodeMapper.selectByCode(reqVO.getCode());
+ if (bag == null) {
+ throw new IllegalArgumentException("鏈В鏋愬埌鏈夋晥琚嬬爜锛岀瀛愯川妫�蹇呴』浠ヨ鐮佹彁浜�");
+ }
+ MesProBatchDO batch = resolveBatch(reqVO.getCode(), reqVO.getBatchCode());
+ if (batch == null || batch.getItemId() == null) {
+ throw new IllegalArgumentException("鏈牴鎹鐮佽В鏋愬埌鐗╂枡淇℃伅锛岃纭鎵爜鍐呭鎴栨壒娆″彿姝ｇ‘");
+ }
+ // 琚嬬爜瀵瑰簲鎵规鐨勫簱瀛樺繀椤诲浜庢殏瀛樺簱锛堝緟璐ㄦ锛変腑锛屾墠鑳借繘琛岀瀛愯川妫�
+ MesWmBatchDO wmBatch = mesWmBatchMapper.selectByCode(batch.getCode());
+ if (wmBatch == null || materialStockMapper.selectTempStockCountByBatchId(wmBatch.getId()) == 0) {
+ throw new IllegalArgumentException("璇ヨ鐮�/鎵规瀵瑰簲鐨勫簱瀛樹笉鍦ㄦ殏瀛樺簱涓紝鏃犳硶杩涜璐ㄦ");
+ }
+ // 鏍￠獙鐩爣鍚堟牸搴擄細蹇呴』瀛樺湪涓斾粨搴撶被鍨嬩负鍚堟牸搴�(20)
+ if (warehouseService.getFirstQualifiedWarehouse() == null) {
+ throw exception(WM_QUALIFIED_WAREHOUSE_NOT_CONFIGURED);
+ }
+ MesWmWarehouseDO qualifiedWarehouse = warehouseService.getWarehouse(reqVO.getQualifiedWarehouseId());
+ if (qualifiedWarehouse == null) {
+ throw exception(WM_WAREHOUSE_NOT_EXISTS);
+ }
+ if (!MesWmWarehouseTypeEnum.QUALIFIED.getType().equals(qualifiedWarehouse.getType())) {
+ throw exception(WM_WAREHOUSE_TYPE_NOT_QUALIFIED);
+ }
+ // 瑙ｆ瀽鍚堟牸搴撻粯璁ゅ簱鍖�/搴撲綅锛堝彇璇ヤ粨搴撲笅绗竴涓簱鍖恒�佸叾涓嬬涓�涓簱浣嶏紝鏈厤缃垯涓� null锛�
+ Long qualifiedLocationId = null;
+ Long qualifiedAreaId = null;
+ List<MesWmWarehouseLocationDO> locations = warehouseLocationService.getWarehouseLocationList(qualifiedWarehouse.getId());
+ if (CollUtil.isNotEmpty(locations)) {
+ qualifiedLocationId = locations.get(0).getId();
+ List<MesWmWarehouseAreaDO> areas = warehouseAreaService.getWarehouseAreaList(qualifiedLocationId);
+ if (CollUtil.isNotEmpty(areas)) {
+ qualifiedAreaId = areas.get(0).getId();
+ }
+ }
Set<String> codes = new HashSet<>();
boolean passed = true;
- MesQcSeedQualityDO quality = MesQcSeedQualityDO.builder().code(reqVO.getCode()).itemId(reqVO.getItemId())
- .batchCode(reqVO.getBatchCode()).reason(reqVO.getReason()).result(0)
+ MesQcSeedQualityDO quality = MesQcSeedQualityDO.builder().code(reqVO.getCode()).itemId(batch.getItemId())
+ .batchCode(batch.getCode()).reason(reqVO.getReason()).result(0)
.inspectedAt(LocalDateTime.now()).build();
qualityMapper.insert(quality);
for (MesQcSeedQualitySubmitReqVO.Indicator item : reqVO.getIndicators()) {
@@ -47,20 +123,151 @@
if (!codes.equals(REQUIRED)) throw new IllegalArgumentException("鍥涢」鎸囨爣涓嶅畬鏁�");
quality.setResult(passed ? 1 : 2);
qualityMapper.updateById(quality);
- // 璐ㄦ鍚堟牸 鈫� 搴撳瓨鏁存壒鐢辨殏瀛樺簱锛堝緟璐ㄦ锛夎浆涓哄悎鏍煎簱锛堟寮忓簱瀛橈級
+ // 鎸夎鐮佺矑搴︽祦杞簱瀛橈細閿佸畾璇ヨ鍦ㄦ殏瀛樺簱涓殑娲诲姩鏄庣粏锛岀姝㈡寜鎵规浠绘剰鎵ｅ噺
+ MesWmMaterialStockBagDO stockBag = materialStockBagMapper.selectActiveByBagCode(bag.getCode());
+ MesWmMaterialStockDO tempStock = resolveTempStock(bag, wmBatch, stockBag);
+ // A. 鏆傚瓨鍑哄簱锛�-1锛夛細璇ヨ绂诲紑鏆傚瓨搴擄紝鍐欏叆璐ㄦ鏆傚瓨鍑哄簱浜嬪姟锛堣烦杩囪鐮佽嚜鍔ㄧ淮鎶わ紝鐢辫川妫�缁熶竴鎺у埗琚嬬爜鏈�缁堣惤鐐癸級
+ MesWmTransactionSaveReqDTO tempOutReq = new MesWmTransactionSaveReqDTO()
+ .setType(MesWmTransactionTypeEnum.OUT.getType())
+ .setBizType(MesBizTypeConstants.QC_SEED_QUALITY)
+ .setBizId(quality.getId())
+ .setBizCode(reqVO.getCode())
+ .setBizLineId(quality.getId())
+ .setItemId(batch.getItemId())
+ .setQuantity(BigDecimal.ONE.negate())
+ .setBatchId(tempStock.getBatchId())
+ .setBatchCode(tempStock.getBatchCode())
+ .setBagCodeId(bag.getId())
+ .setBagCode(bag.getCode())
+ .setWarehouseId(tempStock.getWarehouseId())
+ .setLocationId(tempStock.getLocationId())
+ .setAreaId(tempStock.getAreaId())
+ .setVendorId(tempStock.getVendorId())
+ .setMaterialStockId(tempStock.getId())
+ .setCheckFlag(true)
+ .setSkipBagManage(true);
+ Long tempOutTxId = wmTransactionService.createTransaction(tempOutReq);
if (passed) {
- MesProBatchDO proBatch = proBatchService.getBatchByCode(reqVO.getBatchCode());
- if (proBatch != null) {
- MesWmBatchDO wmBatch = mesWmBatchService.getOrCreateByProBatch(proBatch);
- if (wmBatch != null) {
- int updated = materialStockService.updateStockStateByBatchId(wmBatch.getId(),
- MesWmStockStateEnum.QUALIFIED.getState(), MesWmStockStateEnum.TEMP.getState());
- log.info("[submit][璐ㄦ鍚堟牸锛屾壒娆� {} 搴撳瓨鐢辨殏瀛樺簱杞悎鏍煎簱锛屽奖鍝� {} 鏉", reqVO.getBatchCode(), updated);
+ // B1. 璐ㄦ鍚堟牸 鈫� 璇ヨ杞叆鎿嶄綔鍛橀�夋嫨鐨勫悎鏍煎簱锛屽啓鍏ュ悎鏍煎叆搴撲簨鍔★紙璺宠繃琚嬬爜鑷姩缁存姢锛�
+ MesWmMaterialStockDO qualifiedStock = getOrCreateQualifiedStock(tempStock, qualifiedWarehouse.getId(), qualifiedLocationId, qualifiedAreaId);
+ MesWmTransactionSaveReqDTO qualInReq = new MesWmTransactionSaveReqDTO()
+ .setType(MesWmTransactionTypeEnum.IN.getType())
+ .setBizType(MesBizTypeConstants.QC_SEED_QUALITY)
+ .setBizId(quality.getId())
+ .setBizCode(reqVO.getCode())
+ .setBizLineId(quality.getId())
+ .setItemId(batch.getItemId())
+ .setQuantity(BigDecimal.ONE)
+ .setBatchId(qualifiedStock.getBatchId())
+ .setBatchCode(qualifiedStock.getBatchCode())
+ .setBagCodeId(bag.getId())
+ .setBagCode(bag.getCode())
+ .setWarehouseId(qualifiedStock.getWarehouseId())
+ .setLocationId(qualifiedStock.getLocationId())
+ .setAreaId(qualifiedStock.getAreaId())
+ .setVendorId(qualifiedStock.getVendorId())
+ .setMaterialStockId(qualifiedStock.getId())
+ .setCheckFlag(false)
+ .setStockState(MesWmStockStateEnum.QUALIFIED.getState())
+ .setSkipBagManage(true);
+ Long qualInTxId = wmTransactionService.createTransaction(qualInReq);
+ // B2. 鍚屾杩佺Щ琚嬬爜鏄庣粏鍒板悎鏍煎簱瀛樿惤鐐�
+ materialStockBagService.moveIn(qualInReq, qualifiedStock, qualInTxId);
+ bagCodeMapper.updateQcStatus(bag.getId(), MesProBagCodeQcStatusEnum.QUALIFIED.getStatus());
+ log.info("[submit][璐ㄦ鍚堟牸锛岃鐮� {} 鐢辨殏瀛樺簱杞悎鏍煎簱 {}]", bag.getCode(), qualifiedWarehouse.getName());
+ } else {
+ // C. 璐ㄦ涓嶅悎鏍� 鈫� 璇ヨ鎶ュ簾锛涙殏瀛樺嚭搴撲簨鍔″凡鎵ｅ噺鏆傚瓨搴撳瓨锛屾爣璁拌鐮佹姤搴�
+ materialStockBagService.scrap(tempOutReq, tempOutTxId);
+ bagCodeMapper.updateQcStatus(bag.getId(), MesProBagCodeQcStatusEnum.UNQUALIFIED.getStatus());
+ log.info("[submit][璐ㄦ涓嶅悎鏍硷紝琚嬬爜 {} 鎶ュ簾]", bag.getCode());
+ }
+ return quality.getId();
+ }
+
+ /**
+ * 瀹氫綅璇ヨ鐨勬殏瀛樺簱瀛樻眹鎬昏褰曪紙鍙畾浣嶏紝涓嶆墸鍑忥紱鎵ｅ噺鐢辫川妫�鏆傚瓨鍑哄簱浜嬪姟瀹屾垚锛夈��
+ * <p>
+ * 浼樺厛涓ユ牸鎸夎鐮侀攣瀹氬叾娲诲姩鏄庣粏瀵瑰簲鐨勬殏瀛樿褰曪紱鍘嗗彶鏃犳槑缁嗘椂鍥為��鎸夋壒娆″畾浣嶅苟琛ュ缓鏄庣粏銆�
+ */
+ private MesWmMaterialStockDO resolveTempStock(MesProBagCodeDO bag, MesWmBatchDO wmBatch, MesWmMaterialStockBagDO stockBag) {
+ if (stockBag != null && stockBag.getMaterialStockId() != null) {
+ MesWmMaterialStockDO stock = materialStockMapper.selectById(stockBag.getMaterialStockId());
+ if (stock != null && MesWmStockStateEnum.TEMP.getState().equals(stock.getStockState())) {
+ return stock;
+ }
+ }
+ MesWmMaterialStockDO tempStock = materialStockMapper.selectStockListByBatchId(wmBatch.getId()).stream()
+ .filter(s -> MesWmStockStateEnum.TEMP.getState().equals(s.getStockState()))
+ .max(Comparator.comparing(MesWmMaterialStockDO::getQuantity))
+ .orElse(null);
+ if (tempStock == null) {
+ throw new IllegalArgumentException("璇ユ壒娆℃殏瀛樺簱瀛樹笉瓒筹紝鏃犳硶璐ㄦ");
+ }
+ getOrCreateStockBag(bag, tempStock);
+ return tempStock;
+ }
+
+ /**
+ * 璐ㄦ鍚堟牸锛氬皢璐ㄦ閫氳繃鐨勯偅琚嬭浆鍏ユ搷浣滃憳閫夋嫨鐨勫悎鏍煎簱锛堝悓缁勫悎閿悎鏍煎簱璁板綍 +1锛屼笉瀛樺湪鍒欐柊寤猴級銆�
+ *
+ * @param tempStock 浠庢殏瀛樺簱鎵ｅ噺鍚庤繑鍥炵殑鏆傚瓨璁板綍锛堟惡甯� item/batch/vendor 缁村害锛�
+ * @param qualifiedWarehouseId 鐩爣鍚堟牸搴撲粨搴撶紪鍙�
+ * @param qualifiedLocationId 鐩爣鍚堟牸搴撳簱鍖虹紪鍙凤紙鏈厤缃垯涓� null锛�
+ * @param qualifiedAreaId 鐩爣鍚堟牸搴撳簱浣嶇紪鍙凤紙鏈厤缃垯涓� null锛�
+ */
+ private MesWmMaterialStockBagDO getOrCreateStockBag(MesProBagCodeDO bag, MesWmMaterialStockDO tempStock) {
+ MesWmMaterialStockBagDO stockBag = materialStockBagMapper.selectByBagCode(bag.getCode());
+ if (stockBag != null) {
+ return stockBag;
+ }
+ stockBag = MesWmMaterialStockBagDO.builder().materialStockId(tempStock.getId())
+ .bagCodeId(bag.getId()).bagCode(bag.getCode()).itemId(tempStock.getItemId())
+ .batchId(tempStock.getBatchId()).batchCode(tempStock.getBatchCode()).vendorId(tempStock.getVendorId())
+ .warehouseId(tempStock.getWarehouseId()).locationId(tempStock.getLocationId()).areaId(tempStock.getAreaId())
+ .stockState(MesWmStockStateEnum.TEMP.getState()).status(1).quantity(BigDecimal.ONE)
+ .frozen(false).inboundTime(tempStock.getReceiptTime()).build();
+ materialStockBagMapper.insert(stockBag);
+ return stockBag;
+ }
+
+ private MesWmMaterialStockDO getOrCreateQualifiedStock(MesWmMaterialStockDO tempStock, Long qualifiedWarehouseId,
+ Long qualifiedLocationId, Long qualifiedAreaId) {
+ MesWmMaterialStockDO qualified = materialStockMapper.selectQualifiedByCompositeKey(
+ tempStock.getItemId(), qualifiedWarehouseId, qualifiedLocationId,
+ qualifiedAreaId, tempStock.getBatchId(), tempStock.getVendorId());
+ if (qualified != null) {
+ return qualified;
+ }
+ // 涓嶅瓨鍦ㄥ垯鏂板缓鍚堟牸搴撹褰曪紙浠撳簱/搴撳尯/搴撲綅閲囩敤鎵�閫夊悎鏍煎簱鐨勭淮搴︼紝鏁伴噺鐢辫川妫�鍏ュ簱浜嬪姟 +1锛�
+ MesWmMaterialStockDO newStock = MesWmMaterialStockDO.builder()
+ .itemId(tempStock.getItemId()).itemTypeId(tempStock.getItemTypeId())
+ .warehouseId(qualifiedWarehouseId).locationId(qualifiedLocationId).areaId(qualifiedAreaId)
+ .batchId(tempStock.getBatchId()).batchCode(tempStock.getBatchCode()).vendorId(tempStock.getVendorId())
+ .quantity(BigDecimal.ZERO).receiptTime(LocalDateTime.now())
+ .stockState(MesWmStockStateEnum.QUALIFIED.getState())
+ .frozen(false)
+ .build();
+ materialStockMapper.insert(newStock);
+ return newStock;
+ }
+
+ /**
+ * 鐢辫鐮佹垨鐢熶骇鎵规瑙ｆ瀽鎵�灞炵敓浜ф壒娆★紙琚嬬爜浼樺厛锛屾壒娆＄爜鍏煎涓存椂鐮侊級
+ */
+ private MesProBatchDO resolveBatch(String code, String batchCode) {
+ if (StrUtil.isNotBlank(code)) {
+ MesProBagCodeDO bag = bagCodeMapper.selectByCode(code);
+ if (bag != null && bag.getBatchId() != null) {
+ MesProBatchDO batch = proBatchService.getBatch(bag.getBatchId());
+ if (batch != null) {
+ return batch;
}
}
}
- // 搴撲綅鐢卞悗鍙伴厤缃湇鍔℃帴绠★紝褰撳墠鐗堟湰淇濈暀瀹¤闂幆锛岀姝㈠墠绔紶鍏ュ簱浣嶃��
- return quality.getId();
+ if (StrUtil.isNotBlank(batchCode)) {
+ return proBatchService.getBatchByCode(batchCode);
+ }
+ return null;
}
@Override
--
Gitblit v1.9.3