From 09e7523d24ac947d88d59ac54a25278c2283e5c2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 23 七月 2026 15:49:24 +0800
Subject: [PATCH] 待检验条件修改 现在不需要根据是否为关键工序进行判断了
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineServiceImpl.java | 17 +----
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java | 38 ++++++------
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemconsume/MesWmItemConsumeLineController.java | 35 -----------
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineService.java | 7 +-
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemconsume/MesWmItemConsumeLineMapper.java | 20 +++++-
yudao-module-mes/src/main/resources/mapper/wm/itemconsume/MesWmItemConsumeLineMapper.xml | 32 ++++++++++
6 files changed, 75 insertions(+), 74 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemconsume/MesWmItemConsumeLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemconsume/MesWmItemConsumeLineController.java
index a7c559b..13df255 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemconsume/MesWmItemConsumeLineController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemconsume/MesWmItemConsumeLineController.java
@@ -2,16 +2,8 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLinePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLineRespVO;
-import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
-import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
-
-import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
-import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
-import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
-
import cn.iocoder.yudao.module.mes.service.wm.itemconsume.MesWmItemConsumeLineService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,12 +15,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.Map;
-import java.util.stream.Collectors;
-
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
@Tag(name = "绠$悊鍚庡彴 - MES 鐗╂枡娑堣�楄褰曡")
@RestController
@@ -38,33 +25,15 @@
@Resource
private MesWmItemConsumeLineService itemConsumeLineService;
- @Resource
- private MdmItemApi mdmItemApi;
- @Resource
- private MdmUnitMeasureApi mdmUnitMeasureApi;
@GetMapping("/page")
@Operation(summary = "鏍规嵁鎶ュ伐缂栧彿鍒嗛〉鑾峰彇娑堣�楄鍒楄〃")
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
public CommonResult<PageResult<MesWmItemConsumeLineRespVO>> getItemConsumeLinePage(
@Valid MesWmItemConsumeLinePageReqVO pageReqVO) {
- // 1. 鍒嗛〉鏌ヨ娑堣�楄
- PageResult<MesWmItemConsumeLineDO> pageResult =
+ PageResult<MesWmItemConsumeLineRespVO> pageResult =
itemConsumeLineService.getItemConsumeLinePage(pageReqVO);
- PageResult<MesWmItemConsumeLineRespVO> voPage = BeanUtils.toBean(pageResult, MesWmItemConsumeLineRespVO.class);
- // 2. 鎷兼帴鐗╂枡淇℃伅
- Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
- convertSet(pageResult.getList(), MesWmItemConsumeLineDO::getItemId));
- Map<Long, MdmUnitMeasureRespDTO> unitMap = mdmUnitMeasureApi.getUnitMeasureList(
- convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId)).getCheckedData()
- .stream().collect(Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
- for (MesWmItemConsumeLineRespVO vo : voPage.getList()) {
- findAndThen(itemMap, vo.getItemId(), item -> {
- vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
- findAndThen(unitMap, item.getUnitMeasureId(), unit -> vo.setUnitName(unit.getName()));
- });
- }
- return success(voPage);
+ return success(pageResult);
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemconsume/MesWmItemConsumeLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemconsume/MesWmItemConsumeLineMapper.java
index 722c63d..495f574 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemconsume/MesWmItemConsumeLineMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemconsume/MesWmItemConsumeLineMapper.java
@@ -4,8 +4,12 @@
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLinePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLineRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -17,11 +21,17 @@
@Mapper
public interface MesWmItemConsumeLineMapper extends BaseMapperX<MesWmItemConsumeLineDO> {
- default PageResult<MesWmItemConsumeLineDO> selectPage(MesWmItemConsumeLinePageReqVO reqVO,
- Long consumeId) {
- return selectPage(reqVO, new LambdaQueryWrapperX<MesWmItemConsumeLineDO>()
- .eq(MesWmItemConsumeLineDO::getConsumeId, consumeId)
- .orderByDesc(MesWmItemConsumeLineDO::getId));
+ /**
+ * 鍒嗛〉鏌ヨ娑堣�楄锛堝叧鑱� mdm_item + mdm_unit_measure锛岄�氳繃 feedbackId锛�
+ */
+ IPage<MesWmItemConsumeLineRespVO> selectPageByFeedbackId(
+ Page<MesWmItemConsumeLineRespVO> page, @Param("feedbackId") Long feedbackId);
+
+ default PageResult<MesWmItemConsumeLineRespVO> selectPageByFeedbackId(
+ MesWmItemConsumeLinePageReqVO reqVO) {
+ Page<MesWmItemConsumeLineRespVO> mpPage = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+ IPage<MesWmItemConsumeLineRespVO> result = selectPageByFeedbackId(mpPage, reqVO.getFeedbackId());
+ return new PageResult<>(result.getRecords(), result.getTotal());
}
default List<MesWmItemConsumeLineDO> selectListByConsumeId(Long consumeId) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
index 49b7c45..f05fac3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
@@ -205,28 +205,28 @@
.setStatus(MesProFeedbackStatusEnum.FINISHED.getStatus())
.setUncheckQuantity(BigDecimal.ZERO));
- // 6. 鍏抽敭宸ュ簭锛氱敓鎴愪骇鍑哄崟锛屽苟鏍规嵁鏄惁闇�瑕佹楠屽喅瀹氬叆搴撴柟寮�
- if (keyFlag) {
+ // 6. 鏍规嵁鏄惁闇�瑕佹楠岋紝鍐冲畾浜у嚭鍜屽叆搴撴柟寮�
+ if (checkFlag) {
// 6.1 闇�瑕佹楠岋細鐢熸垚浜у嚭鍗曪紙璐ㄩ噺鐘舵��=寰呮楠岋級锛屾洿鏂版姤宸ョ姸鎬佷负寰呮楠岋紝绛夎川妫�瀹屾垚鍥炶皟鍚庡啀鍏ュ簱
- if (checkFlag) {
- // 瀹屾垚鏃跺洖璋冭锛歁esQcIpqcServiceImpl#finishIpqc 鈫� splitPendingAndFinishProduce + completeFeedbackFromIpqc
- productProduceService.generateProductProduce(feedback, true);
- feedbackMapper.updateById(new MesProFeedbackDO().setId(id)
- .setStatus(MesProFeedbackStatusEnum.UNCHECK.getStatus()));
- return false;
- }
- // 6.2 鏃犻渶妫�楠岋細鐢熸垚浜у嚭鍗曪紙鎸夊悎鏍�/涓嶅悎鏍兼媶琛岋級锛岀洿鎺ュ畬鎴愬叆搴擄紝骞舵洿鏂颁换鍔�/宸ュ崟鐨勫凡鐢熶骇鏁伴噺
+ // 瀹屾垚鏃跺洖璋冭锛歁esQcIpqcServiceImpl#finishIpqc 鈫� splitPendingAndFinishProduce + updateProFeedbackWhenIpqcFinish
+ productProduceService.generateProductProduce(feedback, true);
+ feedbackMapper.updateById(new MesProFeedbackDO().setId(id)
+ .setStatus(MesProFeedbackStatusEnum.UNCHECK.getStatus()));
+ return false;
+ } else {
+ // 6.2 鏃犻渶妫�楠岋細鐢熸垚浜у嚭鍗曪紙鎸夊悎鏍�/涓嶅悎鏍兼媶琛岋級锛岀洿鎺ュ畬鎴愬叆搴�
MesWmProductProduceDO produce = productProduceService.generateProductProduce(feedback, false);
productProduceService.finishProductProduce(produce.getId());
- updateTaskAndWorkOrderByFeedback(feedback);
- } else {
- // 6.3 闈炲叧閿伐搴忥細鍙洿鏂颁换鍔$殑宸茬敓浜ф暟閲忥紙宸ュ崟涓嶆洿鏂帮紝宸ュ崟鍙湅鍏抽敭宸ュ簭浜у嚭锛�
- taskService.updateProducedQuantity(feedback.getTaskId(),
- feedback.getFeedbackQuantity(),
- ObjectUtil.defaultIfNull(feedback.getQualifiedQuantity(), BigDecimal.ZERO),
- ObjectUtil.defaultIfNull(feedback.getUnqualifiedQuantity(), BigDecimal.ZERO));
- // 6.4 闈炲叧閿伐搴忎篃闇�瑕佹鏌� MPS 瀹屾垚鐘舵�侊紙鎵�鏈夊伐搴忔姤宸ュ畬鎴愭墠绠楀畬鎴愶級
- checkAndPublishProductionFinished(feedback.getWorkOrderId());
+ // 鍏抽敭宸ュ簭锛氭洿鏂颁换鍔� + 宸ュ崟鐨勫凡鐢熶骇鏁伴噺锛涢潪鍏抽敭宸ュ簭锛氬彧鏇存柊浠诲姟鐨勫凡鐢熶骇鏁伴噺锛堝伐鍗曞彧鐪嬪叧閿伐搴忎骇鍑猴級
+ if (keyFlag) {
+ updateTaskAndWorkOrderByFeedback(feedback);
+ } else {
+ taskService.updateProducedQuantity(feedback.getTaskId(),
+ feedback.getFeedbackQuantity(),
+ ObjectUtil.defaultIfNull(feedback.getQualifiedQuantity(), BigDecimal.ZERO),
+ ObjectUtil.defaultIfNull(feedback.getUnqualifiedQuantity(), BigDecimal.ZERO));
+ checkAndPublishProductionFinished(feedback.getWorkOrderId());
+ }
}
return true; // 宸插畬鎴�
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineService.java
index bccbd92..49672c6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineService.java
@@ -2,6 +2,7 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLinePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLineRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
import java.util.List;
@@ -21,12 +22,12 @@
void createItemConsumeLineBatch(List<MesWmItemConsumeLineDO> lines);
/**
- * 鏍规嵁鎶ュ伐璁板綍缂栧彿鍒嗛〉鏌ヨ娑堣�楄
+ * 鏍规嵁鎶ュ伐璁板綍缂栧彿鍒嗛〉鏌ヨ娑堣�楄锛堝叧鑱旂墿鏂�+鍗曚綅淇℃伅锛�
*
* @param pageReqVO 鍒嗛〉鏌ヨ鍙傛暟锛堝惈 feedbackId锛�
- * @return 娑堣�楄鍒嗛〉
+ * @return 娑堣�楄鍒嗛〉锛堝惈鐗╂枡缂栫爜銆佸悕绉般�佽鏍笺�佸崟浣嶏級
*/
- PageResult<MesWmItemConsumeLineDO> getItemConsumeLinePage(MesWmItemConsumeLinePageReqVO pageReqVO);
+ PageResult<MesWmItemConsumeLineRespVO> getItemConsumeLinePage(MesWmItemConsumeLinePageReqVO pageReqVO);
/**
* 鏌ヨ鎸囧畾娑堣�楄褰曠殑鎵�鏈夎
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineServiceImpl.java
index 1aacd6e..0fdf252 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineServiceImpl.java
@@ -2,11 +2,10 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLinePageReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeDO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLineRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemconsume.MesWmItemConsumeLineMapper;
import jakarta.annotation.Resource;
-import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -24,24 +23,14 @@
@Resource
private MesWmItemConsumeLineMapper itemConsumeLineMapper;
- @Resource
- @Lazy
- private MesWmItemConsumeService itemConsumeService;
-
@Override
public void createItemConsumeLineBatch(List<MesWmItemConsumeLineDO> lines) {
itemConsumeLineMapper.insertBatch(lines);
}
@Override
- public PageResult<MesWmItemConsumeLineDO> getItemConsumeLinePage(MesWmItemConsumeLinePageReqVO pageReqVO) {
- // 1. 鍏堥�氳繃 feedbackId 鎵惧埌娑堣�楀ご锛堥�氳繃 Service 璋冪敤锛屼笉鐩存帴娉ㄥ叆 Mapper锛�
- MesWmItemConsumeDO consume = itemConsumeService.getByFeedbackId(pageReqVO.getFeedbackId());
- if (consume == null) {
- return PageResult.empty();
- }
- // 2. 鍒嗛〉鏌ヨ娑堣�楄
- return itemConsumeLineMapper.selectPage(pageReqVO, consume.getId());
+ public PageResult<MesWmItemConsumeLineRespVO> getItemConsumeLinePage(MesWmItemConsumeLinePageReqVO pageReqVO) {
+ return itemConsumeLineMapper.selectPageByFeedbackId(pageReqVO);
}
@Override
diff --git a/yudao-module-mes/src/main/resources/mapper/wm/itemconsume/MesWmItemConsumeLineMapper.xml b/yudao-module-mes/src/main/resources/mapper/wm/itemconsume/MesWmItemConsumeLineMapper.xml
new file mode 100644
index 0000000..b137e27
--- /dev/null
+++ b/yudao-module-mes/src/main/resources/mapper/wm/itemconsume/MesWmItemConsumeLineMapper.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.mes.dal.mysql.wm.itemconsume.MesWmItemConsumeLineMapper">
+
+ <!--
+ 鐗╂枡娑堣�楄鍒嗛〉鏌ヨ锛堝叧鑱� mdm_item + mdm_unit_measure锛�
+ 閫氳繃 feedbackId 鍏宠仈娑堣�楀ご锛屽啀鏌ユ秷鑰楄
+ -->
+ <select id="selectPageByFeedbackId" resultType="cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLineRespVO">
+ SELECT
+ l.id,
+ l.consume_id,
+ l.item_id,
+ l.quantity,
+ l.batch_id,
+ l.batch_code,
+ l.remark,
+ l.create_time,
+ i.code AS itemCode,
+ i.name AS itemName,
+ i.specification AS specification,
+ u.name AS unitName
+ FROM mes_wm_item_consume_line l
+ INNER JOIN mes_wm_item_consume c ON l.consume_id = c.id AND c.deleted = 0
+ LEFT JOIN mdm_item i ON l.item_id = i.id AND i.deleted = 0
+ LEFT JOIN mdm_unit_measure u ON i.unit_measure_id = u.id AND u.deleted = 0
+ WHERE l.deleted = 0
+ AND c.feedback_id = #{feedbackId}
+ ORDER BY l.id DESC
+ </select>
+
+</mapper>
--
Gitblit v1.9.3