生产管理修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesMacToolUseDTO.java

@@ -0,0 +1,44 @@
+package org.springblade.desk.produce.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 同炉（槽）查询 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2026-02-04
+ */
+@Data
+public class MesMacToolUseDTO {
+
+	@Schema(description = "绑定编号")
+	private String code;
+
+	@Schema(description = "车间订单号")
+	private String woCode;
+
+	@Schema(description = "物料号")
+	private String partCode;
+
+	@Schema(description = "批次号")
+	private String batchNo;
+
+	@Schema(description = "设备编号")
+	private String deviceCode;
+
+	@Schema(description = "挂具编号")
+	private String rsCode;
+
+	@Schema(description = "飞靶编号")
+	private String fsCode;
+
+	@Schema(description = "开始时间")
+	private Date startTime;
+
+	@Schema(description = "结束时间")
+	private Date endTime;
+
+}

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

@@ -0,0 +1,45 @@
+package org.springblade.desk.produce.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 同炉（槽）查询 视图实体类
+ *
+ * @author BladeX
+ * @since 2026-02-04
+ */
+@Data
+public class MesMacToolUseVO {
+
+	@Schema(description = "绑定编号")
+	private String code;
+
+	@Schema(description = "车间订单号")
+	private String woCode;
+
+	@Schema(description = "物料号")
+	private String partCode;
+
+	@Schema(description = "批次号")
+	private String batchNo;
+
+	@Schema(description = "数量")
+	private String makeQty;
+
+	@Schema(description = "设备编号")
+	private String deviceCode;
+
+	@Schema(description = "挂具编号")
+	private String rsCode;
+
+	@Schema(description = "飞靶编号")
+	private String fsCode;
+
+	@Schema(description = "绑定时间")
+	private String bindTime;
+
+	@Schema(description = "绑定人员")
+	private String name;
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/WorkProcessController.java

@@ -9,7 +9,9 @@ import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.produce.pojo.dto.MesMacToolUseDTO;
 import org.springblade.desk.produce.pojo.entity.MacToolUse;
+import org.springblade.desk.produce.pojo.vo.MesMacToolUseVO;
 import org.springblade.desk.produce.service.IMacToolUseService;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,8 +31,8 @@ public class WorkProcessController extends BladeController {
 	@GetMapping("/queryData")
 	@ApiOperationSupport(order = 1)
 	@Operation(summary = "分页", description = "传入macToolUse")
-	public R<IPage<MacToolUse>> page(MacToolUse macToolUse, Query query) {
-		IPage<MacToolUse> pages = macToolUseService.queryMacToolUse(Condition.getPage(query), macToolUse);
+	public R<IPage<MesMacToolUseVO>> page(MesMacToolUseDTO macToolUse, Query query) {
+		IPage<MesMacToolUseVO> pages = macToolUseService.queryMacToolUse(Condition.getPage(query), macToolUse);
 		return R.data(pages);
 	}
 

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

@@ -2,8 +2,10 @@ package org.springblade.desk.produce.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.desk.produce.pojo.dto.MesMacToolUseDTO;
 import org.springblade.desk.produce.pojo.entity.MacToolUse;
 import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity;
+import org.springblade.desk.produce.pojo.vo.MesMacToolUseVO;
 import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
 
 import java.util.List;
@@ -17,7 +19,7 @@ import java.util.Map;
 public interface MacToolUseMapper extends BaseMapper<MacToolUse> {
 
     MacToolUse getTcDataByWoId(Long woId);
-    List<MacToolUse> queryMacToolUse(IPage<MacToolUse> page, MacToolUse macToolUse);
+    List<MesMacToolUseVO> queryMacToolUse(IPage<MesMacToolUseVO> page, MesMacToolUseDTO macToolUse);
 
     List<ProduceMonitorSlotListVO> listSlotInfo(Long id, int isGr, int isCx);
 

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

@@ -31,9 +31,7 @@
     </resultMap>
 
 
-    <select id="queryMacToolUse" resultMap="mesMakeRecResultMap">
-        select * from MES_MAC_TOOL_USE where is_deleted = 0
-    </select>
+
     <select id="listSlotInfo" resultType="org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO">
         SELECT
         a.PART_CODE, a.BATCH_NO, a.WORK_QTY as qua, a.WORK_QTY as poQty, a.area, a.sumArea, a.sumArea as areaTotal, a.sumArea as totalArea, a.MTN_CODE as mtnCode, a.MTN_CODE as mtuCode, a.MTN_CODE as sameNo, a.PRODUCT_IDENT as prodIdent, a.wo_code, a.material,
@@ -129,6 +127,45 @@
             )
         ORDER BY a.create_time DESC) WHERE ROWNUM = 1
     </select>
-
+    <select id="queryMacToolUse" resultType="org.springblade.desk.produce.pojo.vo.MesMacToolUseVO">
+        SELECT a.MTN_CODE  AS code,
+        c.wo_code   AS woCode,
+        c.PART_CODE AS partCode,
+        c.BATCH_NO  AS batchNo,
+        a.BIND_TIME AS bindTime,
+        c.MAKE_QTY AS makeQty,
+        g.REAL_NAME AS name,
+        d.RS_CODE AS rsCode,
+        e.FS_CODE AS fsCode,
+        f.DEVICE_CODE AS deviceCode
+        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
+        LEFT JOIN MES_RACK_SET d ON a.BS_RACK_SET = d.ID
+        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
+        <where>
+            a.is_deleted = 0
+            <if test="macToolUse.code != null and macToolUse.code != ''">
+                AND a.MTN_CODE LIKE '%' || #{macToolUse.code} || '%'
+            </if>
+            <if test="macToolUse.woCode != null and macToolUse.woCode != ''">
+                AND c.WO_CODE LIKE '%' || #{macToolUse.woCode} || '%'
+            </if>
+            <if test="macToolUse.partCode != null and macToolUse.partCode != ''">
+                AND c.PART_CODE LIKE '%' || #{macToolUse.partCode} || '%'
+            </if>
+            <if test="macToolUse.batchNo != null and macToolUse.batchNo != ''">
+                AND c.BATCH_NO LIKE '%' || #{macToolUse.batchNo} || '%'
+            </if>
+            <if test="macToolUse.startTime != null and macToolUse.endTime != null">
+                AND a.BIND_TIME BETWEEN #{macToolUse.startTime} AND #{macToolUse.endTime}
+            </if>
+        </where>
+        order by a.BIND_TIME DESC
+    </select>
 
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMacToolUseService.java

@@ -2,11 +2,13 @@ package org.springblade.desk.produce.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.desk.produce.pojo.dto.MesMacToolUseDTO;
 import org.springblade.desk.produce.pojo.entity.MacToolUse;
 import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity;
 import org.springblade.desk.produce.pojo.entity.WorkOrder;
 import org.springblade.desk.produce.pojo.entity.WorkPlan;
 import org.springblade.desk.produce.pojo.vo.MacToolUseVO;
+import org.springblade.desk.produce.pojo.vo.MesMacToolUseVO;
 import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
 
 import java.util.List;
@@ -33,7 +35,7 @@ public interface IMacToolUseService extends BaseService<MacToolUse> {
      */
     void unMacToolUseBind(List<MacToolUse> mtuList);
 
-    IPage<MacToolUse> queryMacToolUse(IPage<MacToolUse> page, MacToolUse macToolUse);
+    IPage<MesMacToolUseVO> queryMacToolUse(IPage<MesMacToolUseVO> page, MesMacToolUseDTO macToolUse);
 
     MacToolUse getTcDataByWoId(Long woId);
 

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MacToolUseServiceImpl.java

@@ -15,11 +15,13 @@ import org.springblade.desk.device.pojo.entity.RackSetEntity;
 import org.springblade.desk.device.service.IEquipmentService;
 import org.springblade.desk.device.service.IRackSetService;
 import org.springblade.desk.produce.mapper.MacToolUseMapper;
+import org.springblade.desk.produce.pojo.dto.MesMacToolUseDTO;
 import org.springblade.desk.produce.pojo.entity.MacToolUse;
 import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity;
 import org.springblade.desk.produce.pojo.entity.WorkOrder;
 import org.springblade.desk.produce.pojo.entity.WorkPlan;
 import org.springblade.desk.produce.pojo.vo.MacToolUseVO;
+import org.springblade.desk.produce.pojo.vo.MesMacToolUseVO;
 import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
 import org.springblade.desk.produce.service.IMacToolUseService;
 import org.springframework.stereotype.Service;
@@ -99,7 +101,7 @@ public class MacToolUseServiceImpl extends BaseServiceImpl<MacToolUseMapper, Mac
     }
 
     @Override
-    public IPage<MacToolUse> queryMacToolUse(IPage<MacToolUse> page, MacToolUse macToolUse) {
+    public IPage<MesMacToolUseVO> queryMacToolUse(IPage<MesMacToolUseVO> page, MesMacToolUseDTO macToolUse) {
         return page.setRecords(baseMapper.queryMacToolUse(page, macToolUse));
     }