From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java |   80 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
index ba304b9..b392411 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
@@ -13,7 +13,6 @@
 import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
 import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
-import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService;
 import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
@@ -22,6 +21,8 @@
 import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesService;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
@@ -58,9 +59,6 @@
     private MesQcDefectRecordService defectRecordService;
     @Resource
     @Lazy
-    private MesMdClientService clientService;
-    @Resource
-    @Lazy
     private MesMdItemService itemService;
     @Resource
     @Lazy
@@ -74,6 +72,10 @@
 
     @Resource
     private AdminUserApi adminUserApi;
+    @Resource
+    private MdmItemApi mdmItemApi;
+    @Resource
+    private CrmCustomerApi customerApi;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -118,8 +120,8 @@
     private void validateOqcSaveData(MesQcOqcSaveReqVO reqVO) {
         // 鏍￠獙缂栧彿鍞竴
         validateOqcCodeUnique(reqVO.getId(), reqVO.getCode());
-        // 鏍￠獙瀹㈡埛銆佺墿鏂欍�佹娴嬩汉鍛樺瓨鍦�
-        clientService.validateClientExists(reqVO.getClientId());
+        // 鏍￠獙鐗╂枡銆佹娴嬩汉鍛樺瓨鍦�
+        // 娉細瀹㈡埛 ID 鏉ヨ嚜 CRM锛屼笉闇�瑕佸湪 MES 涓牎楠�
         itemService.validateItemExists(reqVO.getItemId());
         adminUserApi.validateUser(reqVO.getInspectorUserId());
     }
@@ -246,7 +248,9 @@
 
     @Override
     public PageResult<MesQcOqcDO> getOqcPage(MesQcOqcPageReqVO pageReqVO) {
-        return oqcMapper.selectPage(pageReqVO);
+        // 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
+        List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
+        return oqcMapper.selectPage(pageReqVO, permittedClientIds);
     }
 
     @Override
@@ -289,4 +293,66 @@
         oqcMapper.updateById(updateOqc);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long createOqcFromProductSales(Long salesId, MesWmProductSalesLineDO line, String salesCode, Long clientId) {
+        // 1. 鏍￠獙鐗╂枡鏄惁閰嶇疆浜� OQC 妫�楠屾ā鏉�
+        MesQcTemplateItemDO templateItem;
+        try {
+            templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
+                    line.getItemId(), MesQcTypeEnum.OQC.getType());
+        } catch (Exception e) {
+            // 鑾峰彇鐗╂枡淇℃伅锛屾彁渚涙洿鏄庣‘鐨勯敊璇彁绀�
+            String itemInfo = getItemInfo(line.getItemId());
+            throw exception(QC_NO_TEMPLATE_FOR_ITEM, itemInfo);
+        }
+        Long templateId = templateItem.getTemplateId();
+
+        // 2. 鐢熸垚妫�楠屽崟缂栫爜
+        String code = "OQC" + System.currentTimeMillis();
+
+        // 3. 鍒涘缓 OQC 涓昏〃锛堝緟妫�楠岀姸鎬侊紝鍒濆鏁伴噺涓� 0锛�
+        MesQcOqcDO oqc = new MesQcOqcDO();
+        oqc.setCode(code);
+        oqc.setName(salesCode + "-鍑鸿揣妫�楠�");
+        oqc.setTemplateId(templateId);
+        oqc.setSourceDocType(MesBizTypeConstants.WM_PRODUCT_SALES);
+        oqc.setSourceDocId(salesId);
+        oqc.setSourceLineId(line.getId());
+        oqc.setSourceDocCode(salesCode);
+        oqc.setClientId(clientId);
+        oqc.setItemId(line.getItemId());
+        oqc.setBatchCode(line.getBatchCode());
+        oqc.setOutQuantity(line.getQuantity());
+        oqc.setCheckQuantity(BigDecimal.ZERO); // 寰呭～鍐�
+        oqc.setQualifiedQuantity(BigDecimal.ZERO); // 寰呭～鍐�
+        oqc.setUnqualifiedQuantity(BigDecimal.ZERO); // 寰呭～鍐�
+        oqc.setOutDate(java.time.LocalDateTime.now());
+        oqc.setStatus(MesQcStatusEnum.DRAFT.getStatus());
+        oqcMapper.insert(oqc);
+
+        // 4. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
+        oqcLineService.createLinesFromTemplate(oqc.getId(), templateId);
+
+        return oqc.getId();
+    }
+
+    /**
+     * 鑾峰彇鐗╂枡淇℃伅锛堢紪鐮�+鍚嶇О锛�
+     */
+    private String getItemInfo(Long itemId) {
+        if (itemId == null) {
+            return "鏈煡鐗╂枡";
+        }
+        try {
+            cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO item = mdmItemApi.getItem(itemId).getCheckedData();
+            if (item != null) {
+                return item.getCode() + "-" + item.getName();
+            }
+        } catch (Exception e) {
+            // 蹇界暐寮傚父
+        }
+        return "鐗╂枡ID:" + itemId;
+    }
+
 }

--
Gitblit v1.9.3