生产管理修改

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.xml

@@ -5,23 +5,27 @@
     <select id="queryByReadStatus" resultType="org.springblade.desk.produce.pojo.vo.PlateAroundVO">
         SELECT
         c.ID AS woId,
-        a.PA_CODE as paCode,
-        c.CARD_NO as cardNo,
-        c.WO_CODE as woCode,
-        c.BATCH_NO as batchNo,
-        d.PART_CODE as partCode,
-        d.PART_NAME as partName,
-        a.QUANTITY as quantity,
-        a.TS_ID as tsId,
-        a.OC_ID as ocId,
-        b.ORDERS as orders,
-        b.PPS_ID as ppsId,
-        a.CREATE_USER as createUser,
-        a.CREATE_TIME as createTime
+        a.PA_CODE AS paCode,
+        c.CARD_NO AS cardNo,
+        c.WO_CODE AS woCode,
+        c.BATCH_NO AS batchNo,
+        d.PART_CODE AS partCode,
+        d.PART_NAME AS partName,
+        a.QUANTITY AS quantity,
+        ts.TS_NAME AS tsId,
+        bo.OC_NAME AS ocId,
+        b.ORDERS AS orders,
+        ps.name AS ppsId,
+        bu.REAL_NAME AS createUser,
+        a.CREATE_TIME AS createTime
         FROM MES_PLATE_AROUND 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
+        LEFT JOIN BS_TEAM_SET ts ON b.MAKE_TEAM = ts.id
+        LEFT JOIN BS_PROCESS_SET ps ON b.pps_id = ps.id
+        LEFT JOIN BLADE_USER bu ON a.CREATE_USER = bu.id
+        LEFT JOIN BS_OEM bo ON bo.ID = a.OC_ID
         <where>
             a.IS_DELETED = 0 and a.PA_TYPE = #{query.paType}
             <if test="query.paCode != null and query.paCode != ''">