添加 报工明细

src/main/java/cn/ezhizao/project/business/controller/BizDayworkController.java

@@ -7,6 +7,7 @@ import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
 import cn.ezhizao.project.business.domain.BizDaywork;
+import cn.ezhizao.project.business.domain.BizDayworkItem;
 import cn.ezhizao.project.business.service.IBizProcessService;
 import cn.ezhizao.project.business.service.IBizDayworkCarrierService;
 import cn.ezhizao.project.business.service.IBizDayworkService;
@@ -56,7 +57,20 @@ public class BizDayworkController extends BaseController {
     }
 
     /**
-     * 导出报工列表
+     * 查询报工列表
+     * @param bizDayworkItem
+     * @return TableDataInfo
+     */
+    @PostMapping("/listItem")
+    public TableDataInfo listItem(BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
+        startPage();
+        //查询批次报工信息列表
+        List<BizDayworkItem> itemList = bizDayworkService.getItemList(bizDayworkItem);
+        return getDataTable(itemList);
+    }
+
+    /**
+     * 导出批次报工列表
      */
     @Log(title = "报工", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -74,5 +88,4 @@ public class BizDayworkController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(bizDayworkService.getById(id));
     }
-
 }

src/main/java/cn/ezhizao/project/business/domain/BizDayworkItem.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
@@ -17,101 +18,138 @@ import java.util.Date;
  * @date 2023-12-04
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName(value = "biz_daywork_item")
-public class BizDayworkItem extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 租户（厂别）id */
+public class BizDayworkItem extends BaseEntity {
+    /**
+     * 租户（厂别）id
+     */
     @ApiModelProperty(value = "${comment}")
     private Long tenantId;
 
-    /** daywork的id */
+    /**
+     * daywork的id
+     */
     @ApiModelProperty(value = "${comment}")
     private Long dayworkId;
 
-    /** 计划单id */
+    /**
+     * 计划单id
+     */
     @ApiModelProperty(value = "${comment}")
     private Long productionPlanId;
 
-    /** 计划单明细id */
+    /**
+     * 计划单明细id
+     */
     @ApiModelProperty(value = "${comment}")
     private Long productionPlanDetailId;
 
-    /** 子计划id */
+    /**
+     * 子计划id
+     */
     @ApiModelProperty(value = "${comment}")
     private Long productionPlanDetailSubDetailId;
 
-    /** 子计划工序对应的设备id */
+    /**
+     * 子计划工序对应的设备id
+     */
     @ApiModelProperty(value = "${comment}")
     private Long productionPlanDetailSubDetailEquipmentId;
 
 
-
-    /** 批次号 */
+    /**
+     * 批次号
+     */
     @ApiModelProperty(value = "${comment}")
     private Long lotId;
 
-    /** 载具id */
+    /**
+     * 载具id
+     */
     @ApiModelProperty(value = "${comment}")
     private Long vehicleId;
 
     /** 投产数 */
-//    @Excel(name = "投产数")
-//    @ApiModelProperty(value = "投产数")
-//    private Integer productionNum;
+    @Excel(name = "投产数")
+    @ApiModelProperty(value = "投产数")
+    private Integer productionNum;
 
-    /** 合格数 */
+    /**
+     * 合格数
+     */
     @Excel(name = "合格数")
     @ApiModelProperty(value = "合格数")
     private Integer qualifiedNum;
 
-    /** 工艺id（通过工艺id，获取版本号） */
+    /**
+     * 工艺id（通过工艺id，获取版本号）
+     */
     @ApiModelProperty(value = "合格数")
     private Long technologicalProcessId;
 
-    /** 工序id */
+    /**
+     * 工序id
+     */
     @ApiModelProperty(value = "合格数")
     private Long processId;
 
-    /** 设备id */
+    /**
+     * 设备id
+     */
     @ApiModelProperty(value = "合格数")
     private Long equipmentDetailId;
 
-    /** 设备编码 */
+    /**
+     * 设备编码
+     */
     @Excel(name = "设备编码")
     @ApiModelProperty(value = "设备编码")
     private String equipmentDetailCode;
 
-    /** 生产状态0:未开始, 1:生产中 ,2:已完成 */
+    /**
+     * 生产状态0:未开始, 1:生产中 ,2:已完成
+     */
     @Excel(name = "生产状态0:未开始, 1:生产中 ,2:已完成")
     @ApiModelProperty(value = "生产状态0:未开始, 1:生产中 ,2:已完成")
     private String status;
 
-    /** 用户id */
+    /**
+     * 用户id
+     */
     @ApiModelProperty(value = "生产状态0:未开始, 1:生产中 ,2:已完成")
     private Long userId;
 
-    /** 员工编码 */
+    /**
+     * 员工编码
+     */
     @Excel(name = "员工编码")
     @ApiModelProperty(value = "员工编码")
     private String userName;
 
-    /** 员工姓名 */
+    /**
+     * 员工姓名
+     */
     @Excel(name = "员工姓名")
     @ApiModelProperty(value = "员工姓名")
     private String nickName;
 
-    /** 开始时间 */
+    /**
+     * 开始时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty(value = "开始时间")
     private Date startTime;
-    /** 批次号 */
+    /**
+     * 批次号
+     */
     @TableField(exist = false)
     @ApiModelProperty(value = "${comment}")
     private String lotCode;
-    /** 结束时间 */
+    /**
+     * 结束时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty(value = "结束时间")
@@ -120,7 +158,9 @@ public class BizDayworkItem extends BaseEntity
     private Integer rejectNum;
 
     private String reason;
-    /** 前端传来的下一道工序Id */
+    /**
+     * 前端传来的下一道工序Id
+     */
     @TableField(exist = false)
     private Long processDemoId;
 }

src/main/java/cn/ezhizao/project/business/mapper/BizDayworkMapper.java

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.business.mapper;
 
 import cn.ezhizao.project.business.domain.BizDaywork;
+import cn.ezhizao.project.business.domain.BizDayworkItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;
@@ -21,6 +22,14 @@ public interface BizDayworkMapper extends BaseMapper<BizDaywork> {
      */
     public List<BizDaywork> getList(BizDaywork bizDaywork);
 
+    /**
+     * 查询报工列表
+     *
+     * @param bizDayworkItem 报工
+     * @return 报工集合
+     */
+    public List<BizDayworkItem> getItemList(BizDayworkItem bizDayworkItem);
+
     /**
      * 物理删除
      *

src/main/java/cn/ezhizao/project/business/service/IBizDayworkService.java

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.business.service;
 
 import cn.ezhizao.project.business.domain.BizDaywork;
+import cn.ezhizao.project.business.domain.BizDayworkItem;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -12,21 +13,29 @@ import java.util.List;
  * @author ezhizao
  * @date 2023-11-29
  */
-public interface IBizDayworkService extends IService<BizDaywork>
-{
+public interface IBizDayworkService extends IService<BizDaywork> {
     /**
      * 查询报工列表
      *
      * @param bizDaywork 报工
      * @return 报工集合
      */
-    public List<BizDaywork> getList(BizDaywork bizDaywork);
+    List<BizDaywork> getList(BizDaywork bizDaywork);
+
+    /**
+     * 查询报工列表
+     *
+     * @param bizDayworkItem 报工
+     * @return 报工集合
+     */
+    List<BizDayworkItem> getItemList(BizDayworkItem bizDayworkItem);
 
     /**
      * 物理删除
+     *
      * @param bizDaywork
      * @return 删除结果
      */
-    public int physicalDelete(BizDaywork bizDaywork);
+    int physicalDelete(BizDaywork bizDaywork);
 
 }

src/main/java/cn/ezhizao/project/business/service/impl/BizDayworkServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.business.service.impl;
 
 import cn.ezhizao.project.business.domain.BizDaywork;
+import cn.ezhizao.project.business.domain.BizDayworkItem;
 import cn.ezhizao.project.business.mapper.BizDayworkMapper;
 import cn.ezhizao.project.business.service.IBizDayworkService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,8 +18,7 @@ import java.util.List;
  * @date 2023-11-29
  */
 @Service
-public class BizDayworkServiceImpl  extends ServiceImpl<BizDayworkMapper, BizDaywork> implements IBizDayworkService
-{
+public class BizDayworkServiceImpl extends ServiceImpl<BizDayworkMapper, BizDaywork> implements IBizDayworkService {
     @Resource
     private BizDayworkMapper bizDayworkMapper;
 
@@ -29,17 +29,32 @@ public class BizDayworkServiceImpl  extends ServiceImpl<BizDayworkMapper, BizDay
      * @return 报工
      */
     @Override
-    public List<BizDaywork> getList(BizDaywork bizDaywork)
-    {
+    public List<BizDaywork> getList(BizDaywork bizDaywork) {
         return bizDayworkMapper.getList(bizDaywork);
     }
 
+    /**
+     * 查询报工详情列表
+     *
+     * @param bizDayworkItem 报工
+     * @return 报工
+     */
+    @Override
+    public List<BizDayworkItem> getItemList(BizDayworkItem bizDayworkItem) {
+        return bizDayworkMapper.getItemList(bizDayworkItem);
+    }
+
     /**
      * 物理删除
+     *
      * @param bizDaywork
      * @return 删除结果
      */
     @Override
-    public int physicalDelete(BizDaywork bizDaywork){ return bizDayworkMapper.physicalDelete(bizDaywork); };
+    public int physicalDelete(BizDaywork bizDaywork) {
+        return bizDayworkMapper.physicalDelete(bizDaywork);
+    }
+
+    ;
 
 }

src/main/resources/mybatis/business/BizDayworkMapper.xml

@@ -17,11 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result column="carrier_name" property="carrierName" />
     </resultMap>
 
-    <resultMap id="BizTechnologicalProcessDetailResult" type="cn.ezhizao.project.business.domain.BizTechnologicalProcessDetail">
-        <id column="id" property="id"/>
-    </resultMap>
-
-    <resultMap id="BizProcessResult" type="cn.ezhizao.project.business.domain.BizProcess">
+    <resultMap id="BizDayworkItemResult" type="cn.ezhizao.project.business.domain.BizDayworkItem">
         <id column="id" property="id"/>
     </resultMap>
 
@@ -52,6 +48,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY t1.create_time DESC
     </select>
 
+    <select id="getItemList" parameterType="BizDayworkItem" resultMap="BizDayworkItemResult">
+        SELECT
+             t1.*,
+             t2.nick_name,
+             t2.user_name,
+             t3.process_alias,
+             t3.process_code
+
+        FROM biz_daywork_item t1
+        LEFT JOIN sys_user t2 ON t1.user_id = t2.user_id
+        LEFT JOIN biz_process t3 ON t1.process_id = t3.id
+
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            t1.deleted = 0
+            <if test="dayworkId != null and dayworkId != 0"> AND t1.daywork_id = #{dayworkId}</if>
+        </trim>
+        ORDER BY t1.create_time DESC
+    </select>
+
     <delete id="physicalDelete">
         DELETE FROM biz_daywork
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">