From fdfe9e75d981fd3c5372d2355bd8b88635db0db4 Mon Sep 17 00:00:00 2001
From: pangyang <475446853@qq.com>
Date: Wed, 18 Mar 2026 19:48:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=A7=E7=BB=93=E6=95=B0=E6=8D=AE=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=9C=AA=E5=AE=8C=E6=88=90002?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/mapper/WorkPlanMapper.xml    | 24 +++++++++----------
 .../service/impl/AuditFileServiceImpl.java    |  8 +++++--
 .../system/controller/UserController.java     |  9 +++++++
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
index c9d36bb8..e2de88e0 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
@@ -75,8 +75,8 @@
     <select id="listSlotInfoGr" resultType="org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO">
         select a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
                a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type from (
-                  select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.PO_AREA as area,
-                  sum(b.WORK_QTY*d.PO_AREA) over() as sumArea,a.MTN_CODE, d.prod_ident,c.wo_code,f.material,d.yield_type
+                  select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area,
+                  sum(b.WORK_QTY*d.YP_AREA) over() as sumArea,a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type
                   from MES_MAC_TOOL_USE a
                   inner join MES_WORK_PLAN b on a.WP_ID = b.ID
                   inner join MES_WORK_ORDER c on b.WO_ID = c.ID
@@ -100,8 +100,8 @@
     <select id="listSlotInfoList" resultType="org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO">
         select a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
                a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type from (
-                   select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.PO_AREA as area,
-                   sum(b.WORK_QTY*d.PO_AREA) over() as sumArea, a.MTN_CODE, d.prod_ident,c.wo_code,f.material,d.yield_type
+                   select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area,
+                   sum(b.WORK_QTY*d.YP_AREA) over() as sumArea, a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type
                    from MES_MAC_TOOL_USE a
                     inner join MES_WORK_PLAN b on a.WP_ID = b.ID
                     inner join MES_WORK_ORDER c on b.WO_ID = c.ID
@@ -163,7 +163,7 @@
     <select id="getQcReviewSheetListMes" resultType="org.springblade.desk.quality.pojo.entity.ReviewSheet">
         select a.rs_code,a.memo,a.unqualified_qty,a.REVIEW_DATE from QA_REVIEW_SHEET a
 --                inner join rb_pr_work_check b on a.wc_id = b.wc_id
-               inner join MES_WORK_PLAN c on b.wp_id=c.id
+               inner join MES_WORK_PLAN c on a.wp_id=c.id
                inner join MES_WORK_ORDER d on c.wo_id=d.id
                inner join MES_YIELD_ORDER e on e.id = d.yo_id
                 where e.part_code = #{partCode} and e.batch_no = #{batchNo}
@@ -201,16 +201,16 @@
     <select id="listSjSlotInfoMes" resultType="org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO">
         select a.PART_CODE, a.BATCH_NO, a.WORK_QTY as qua, a.area, a.sumArea as totalArea,a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
         from (
-                 select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.PO_AREA as area,
-                        sum(b.WORK_QTY*d.PO_AREA) over() as sumArea,
-                         a.MTN_CODE, d.prod_ident,c.wo_code,f.material,d.yield_type from MES_MAC_TOOL_USE a
-                         inner join MES_WORK_PLAN b on a.WP_ID = b.WP_ID
+                 select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area,
+                        sum(b.WORK_QTY*d.YP_AREA) over() as sumArea,
+                         a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type from MES_MAC_TOOL_USE a
+                         inner join MES_WORK_PLAN b on a.WP_ID = b.ID
                          inner join MES_WORK_ORDER c on b.WO_ID = c.ID
                          inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
                          inner join ds_part f on d.part_code = f.part_code
                         where a.MTN_CODE in(
                             select a.MTN_CODE from MES_MAC_TOOL_USE a
-                            left join DE_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
+                            left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
                             where a.WP_ID = #{wpId}
                             <if test="aTrue==true">
                                 and b.CATEGORYS = '产线设备'
@@ -225,11 +225,11 @@
 
 
     <select id="findFatherByYoIdMes" resultType="org.springblade.desk.produce.pojo.entity.WorkOrder">
-        select * from pr_work_order a inner join pj_yield_order  b on a.yo_id = b.id and b.id = #{yoId}
+        select * from MES_WORK_ORDER a inner join MES_YIELD_ORDER  b on a.yo_id = b.id and a.yo_id = #{yoId}
     </select>
 
     <select id="listByWoIdAllMes" resultType="org.springblade.desk.produce.pojo.entity.WorkPlan">
-        select a.* from rb_pr_work_plan a where a.wo_id= #{woId} order by orders asc
+        select a.* from MES_WORK_PLAN a where a.wo_id= #{woId} order by orders asc
     </select>
 
     <select id="getBoxInfoByWpIdMtnCodeList" resultType="org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity">
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java
index e4abdf42..d8b19bde 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java
@@ -74,12 +74,16 @@ public class AuditFileServiceImpl extends EnBaseServiceImpl<AuditFileMapper, Aud
 
     @Override
     public R upgradeVer(AuditFile find) {
+
+        AuditFile file =  this.getById(find.getId());
+        file.setStatus(AuditFileConst.S_ABANDON);
+        updateById(file);
         AuditFile create = new AuditFile();
         BeanUtil.copyProperties(find, create);
-        find.setStatus(AuditFileConst.S_ABANDON);
+//        find.setStatus(AuditFileConst.S_ABANDON);
         create.setStatus(AuditFileConst.S_NORMAL);
         create.setId(null);
-        updateById(find);
+//        updateById(find);
         save(create);
         return R.success("升版成功");
     }
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java
index 4540b217..85a3f282 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java
@@ -303,6 +303,15 @@ public class UserController {
         return R.data(UserWrapper.build().listVO(list));
     }
 
+    @GetMapping("/userListByRaise")
+    @ApiOperationSupport(order = 11)
+    @Operation(summary = "用户列表", description = "传入user")
+    public R<List<User>> userListByRaise(User user, BladeUser bladeUser) {
+        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+        List<User> list = userService.list(queryWrapper);
+        return R.data(list);
+    }
+
     /**
      * 导入用户
      */