特殊报工分支

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

@@ -125,6 +125,57 @@ public class BizSpecialDayworkController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询deptProcess列表
+     */
+//    @PreAuthorize("@ss.hasPermi('business:deptProcess:list')")
+    @PostMapping("/list")
+    public AjaxResult list(@RequestBody Map<String, Object> data) throws NoSuchFieldException, IllegalAccessException {
+        List<String> statusList = Arrays.asList("0", "1", "2");
+        Long deptId = Long.parseLong(data.get("deptId").toString());
+        List<BizDeptProcess> deptProcesses = bizDeptProcessService.query().eq("dept_id", deptId).list();
+        List<Long> deptProcessIds = deptProcesses.stream().map(BizDeptProcess::getProcessId).collect(Collectors.toList());
+
+        long dayworkId = 0L;
+        if (data.get("dayworkId") != null) {
+            dayworkId = Long.parseLong(data.get("dayworkId").toString());
+        }
+
+        long planDetailId = 0L;
+        if (data.get("planDetailId") != null) {
+            planDetailId = Long.parseLong(data.get("planDetailId").toString());
+            BizProductionPlanDetail productionPlanDetail = bizProductionPlanDetailService.getById(planDetailId);
+            List<BizTechnologicalProcessDetail> technologicalProcessDetails = bizTechnologicalProcessDetailService.query()
+                    .eq("technological_process_id", productionPlanDetail.getTechnologicalProcessId())
+                    .ne("tenant_id", 9)
+                    .in("process_id", deptProcessIds)
+                    .orderByAsc("process_step_number")
+                    .list();
+
+            return success(technologicalProcessDetails);
+        }
+        /* 当一个工序未工序完成，再开始报工时，只能做当前工序，不允许做其它工序
+        if (dayworkId > 0){
+            List<BizDayworkItem> itemList = bizDayworkItemService.query()
+                    .eq("daywork_id", dayworkId)
+                    .in("status", statusList)
+                    .orderByDesc("create_time")
+                    .list();
+            //如果当前批次有未完成的工序，那么只能做这一道工序
+            for (BizDeptProcess item : list) {
+                if (!itemList.isEmpty()){
+                    //保留工段下和他相同的那一条工序
+                    if(itemList.get(0).getProcessId().equals(item.getProcessId())){
+                        returnList.add(item);
+                        return success(returnList);
+                    }
+                }
+            }
+        }
+        */
+        return success(deptProcesses);
+    }
+
     @Log(title = "特殊报工首序报工查询批次信息", businessType = BusinessType.SELECT)
     @GetMapping("/selectLotList")
     public AjaxResult selectLotList(BizLot bizLot) {

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

@@ -0,0 +1,49 @@
+package cn.ezhizao.project.business.domain;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * deptProcess对象 biz_dept_process
+ *
+ * @author ezhizao
+ * @date 2023-12-11
+ */
+@Data
+@TableName(value = "biz_dept_process")
+public class BizDeptProcess extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 租户id */
+    @ApiModelProperty(value = "${comment}")
+    private Long tenantId;
+
+    /** 部门（工段） */
+    @ApiModelProperty(value = "${comment}")
+    private Long deptId;
+
+    /** 工序id */
+    @ApiModelProperty(value = "${comment}")
+    private Long processId;
+
+    /** XX主序 XX次序 X分序 */
+    @Excel(name = "XX主序 XX次序 X分序")
+    @ApiModelProperty(value = "XX主序 XX次序 X分序")
+    private String processCode;
+
+    /** 工序简称 */
+    @Excel(name = "工序简称")
+    @ApiModelProperty(value = "工序简称")
+    private String processAlias;
+
+    @TableField(exist = false)
+    private Long dayworkId;
+
+
+}

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

@@ -0,0 +1,37 @@
+package cn.ezhizao.project.business.mapper;
+
+import cn.ezhizao.project.business.domain.BizDeptProcess;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+
+/**
+ * deptProcessMapper接口
+ *
+ * @author ezhizao
+ * @date 2023-12-11
+ */
+public interface BizDeptProcessMapper extends BaseMapper<BizDeptProcess>
+{
+    /**
+     * 查询deptProcess列表
+     *
+     * @param bizDeptProcess deptProcess
+     * @return deptProcess集合
+     */
+    public List<BizDeptProcess> getList(BizDeptProcess bizDeptProcess);
+
+    /**
+     * 物理删除
+     * @param bizDeptProcess
+     * @return 删除结果
+    */
+    public int physicalDelete(BizDeptProcess bizDeptProcess);
+
+    /**
+     * 查询特殊部门工序列表(下料,清洗)
+     * @return
+     */
+    List<BizDeptProcess> getSpecialDeptProcessList();
+}

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

@@ -0,0 +1,38 @@
+package cn.ezhizao.project.business.service;
+
+
+import cn.ezhizao.project.business.domain.BizDeptProcess;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+
+/**
+ * deptProcessService接口
+ *
+ * @author ezhizao
+ * @date 2023-12-11
+ */
+public interface IBizDeptProcessService extends IService<BizDeptProcess>
+{
+    /**
+     * 查询deptProcess列表
+     *
+     * @param bizDeptProcess deptProcess
+     * @return deptProcess集合
+     */
+    public List<BizDeptProcess> getList(BizDeptProcess bizDeptProcess);
+
+    /**
+     * 物理删除
+     * @param bizDeptProcess
+     * @return 删除结果
+     */
+    public int physicalDelete(BizDeptProcess bizDeptProcess);
+
+    /**
+     * 查询特殊部门工序列表(下料,清洗)
+     * @return
+     */
+    List<BizDeptProcess> getSpecialDeptProcessList();
+}

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

@@ -0,0 +1,51 @@
+package cn.ezhizao.project.business.service.impl;
+
+
+import cn.ezhizao.project.business.domain.BizDeptProcess;
+import cn.ezhizao.project.business.mapper.BizDeptProcessMapper;
+import cn.ezhizao.project.business.service.IBizDeptProcessService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * deptProcessService业务层处理
+ *
+ * @author ezhizao
+ * @date 2023-12-11
+ */
+@Service
+public class BizDeptProcessServiceImpl extends ServiceImpl<BizDeptProcessMapper, BizDeptProcess> implements IBizDeptProcessService
+{
+    @Resource
+    private BizDeptProcessMapper bizDeptProcessMapper;
+
+    /**
+     * 查询deptProcess列表
+     *
+     * @param bizDeptProcess deptProcess
+     * @return deptProcess
+     */
+    @Override
+    public List<BizDeptProcess> getList(BizDeptProcess bizDeptProcess)
+    {
+        return bizDeptProcessMapper.getList(bizDeptProcess);
+    }
+
+    /**
+     * 物理删除
+     * @param bizDeptProcess
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizDeptProcess bizDeptProcess){ return bizDeptProcessMapper.physicalDelete(bizDeptProcess); }
+
+    @Override
+    public List<BizDeptProcess> getSpecialDeptProcessList() {
+        return bizDeptProcessMapper.getSpecialDeptProcessList();
+    }
+
+}