Merge remote-tracking branch 'origin/master'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesMacToolUseVO.java

@@ -24,6 +24,9 @@ public class MesMacToolUseVO {
 	@Schema(description = "车间订单号")
 	private String woCode;
 
+	@Schema(description = "流程卡号")
+	private String cardNo;
+
 	@Schema(description = "物料号")
 	private String partCode;
 
@@ -51,4 +54,11 @@ public class MesMacToolUseVO {
 	@Schema(description = "挂次号")
 	private String hangNum;
 
+	@Schema(description = "工序号")
+	private String orders;
+
+	@Schema(description = "工序名称")
+	private String ppsName;
+
+
 }

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

@@ -129,6 +129,9 @@
     </select>
     <select id="queryMacToolUse" resultType="org.springblade.desk.produce.pojo.vo.MesMacToolUseVO">
         SELECT a.MTN_CODE  AS code,
+        b.orders AS orders,
+        h.name AS ppsName,
+        c.card_no AS cardNo,
         c.wo_code   AS woCode,
         c.PART_CODE AS partCode,
         c.BATCH_NO  AS batchNo,
@@ -147,6 +150,7 @@
         LEFT JOIN MES_FEI_BA_SET e ON a.BS_FEI_BA_SET = e.ID
         LEFT JOIN MES_EQUIPMENT f ON a.EQUIPMENT_CARD = f.ID
         LEFT JOIN blade_user g ON a.CREATE_MAN = g.ID
+        LEFT JOIN BS_PROCESS_SET h ON b.PPS_ID = h.ID
         <where>
             a.is_deleted = 0
             <if test="macToolUse.code != null and macToolUse.code != ''">