Merge remote-tracking branch 'origin/master'

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

@@ -13,6 +13,7 @@ import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
 import cn.ezhizao.project.business.domain.*;
 import cn.ezhizao.project.business.service.*;
+import cn.ezhizao.project.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -47,9 +48,21 @@ public class BizTechnologicalAmendController extends BaseController
     @Resource
     private IBizLotService bizLotService;
 
+    @Resource
+    private IBizProductionPlanDetailService bizProductionPlanDetailService;
+
+    @Resource
+    private IBizFurnaceNoInfoService bizFurnaceNoInfoService;
+
+    @Resource
+    private IBizDayworkService bizDayworkService;
+
     @Resource
     private IBizProcessService bizProcessService;
 
+    @Resource
+    private ISysDeptService sysDeptService;
+
     /**
      * 查询修改后工艺列表
      */
@@ -75,6 +88,37 @@ public class BizTechnologicalAmendController extends BaseController
 
 
 
+    @GetMapping("/lotParticulars/{lotCode}")
+    public AjaxResult lotParticulars(@PathVariable("lotCode") String lotCode) throws NoSuchFieldException, IllegalAccessException
+    {
+        //根据查询批次信息
+        BizLot lot =new BizLot();
+        lot.setLotCode(lotCode);
+        try {
+            lot=bizLotService.getList(lot).get(0);
+        } catch (Exception e) {
+            throw new RuntimeException("批次信息异常！");
+        }
+        //查询计划单信息
+        lot.setProductionPlanDetail(bizProductionPlanDetailService.getById(lot.getProductionPlanDetailId()));
+        //查询报工信息
+        BizDaywork daywork=new BizDaywork();
+        daywork.setLotId(lot.getId());
+        daywork=bizDayworkService.getList(daywork).get(0);
+        lot.setDaywork(daywork);
+        //根据报工id和计划单id查询 furnaceNoInfo
+        BizFurnaceNoInfo furnaceNoInfo=new BizFurnaceNoInfo();
+        furnaceNoInfo.setProductionPlanDetailId(lot.getProductionPlanDetailId());
+        furnaceNoInfo.setDayworkId(daywork.getId());
+        lot.getProductionPlanDetail().setRequisitionDepartmentName(sysDeptService.selectDeptById(daywork.getDeptId()).getDeptName());
+
+        //设置furnaceNoInfo
+        lot.setFurnaceNoInfo(bizFurnaceNoInfoService.getList(furnaceNoInfo).get(0));
+        return success(lot);
+    }
+
+
+
 
 
     /**
@@ -102,7 +146,15 @@ public class BizTechnologicalAmendController extends BaseController
         //根据id查询批次信息
         BizLot lot = bizLotService.getById(lotId);
 
-        BizTechnologicalProcess technologicalProcess = bizTechnologicalProcessService.getById(lot.getTechnologicalProcessId());
+        BizTechnologicalProcess technologicalProcess =new BizTechnologicalProcess();
+        //是否进行过单批单改
+        if(lot.getIsAmend()==1){
+            BizTechnologicalAmend technologicalAmend = bizTechnologicalAmendService.getById(lot.getTechnologicalProcessId());
+            technologicalProcess = bizTechnologicalProcessService.getById(technologicalAmend.getTechnologicalProcessId());
+        }else{
+            technologicalProcess = bizTechnologicalProcessService.getById(lot.getTechnologicalProcessId());
+        }
+
         //新增修改后工艺信息
         BizTechnologicalAmend amend = new BizTechnologicalAmend();
         amend.setTenantId(lot.getTenantId());

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

@@ -127,9 +127,22 @@ public class BizLot extends BaseEntity {
     @TableField(exist = false)
     private Long deptId;
 
+
     @TableField(exist = false)
     private String productShaftCategoryName;
 
+    // 炉号信息
+    @TableField(exist = false)
+    private BizFurnaceNoInfo furnaceNoInfo;
+
+    //生产计划信息
+    @TableField(exist = false)
+    private BizProductionPlanDetail productionPlanDetail;
+
+    //报工信息
+    @TableField(exist = false)
+    private BizDaywork daywork;
+
     @TableField(exist = false)
     private List<BizTechnologicalProcessDetail> technologicalProcessDetailList;
 

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

@@ -0,0 +1,32 @@
+package cn.ezhizao.project.business.mapper;
+
+
+import cn.ezhizao.project.business.domain.BizFurnaceNoInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+
+/**
+ * 企业租户Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-01-30
+ */
+public interface BizFurnaceNoInfoMapper extends BaseMapper<BizFurnaceNoInfo>
+{
+    /**
+     * 查询企业租户列表
+     *
+     * @param bizFurnaceNoInfo 企业租户
+     * @return 企业租户集合
+     */
+    public List<BizFurnaceNoInfo> getList(BizFurnaceNoInfo bizFurnaceNoInfo);
+
+    /**
+     * 物理删除
+     * @param bizFurnaceNoInfo
+     * @return 删除结果
+    */
+    public int physicalDelete(BizFurnaceNoInfo bizFurnaceNoInfo);
+}

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

@@ -0,0 +1,33 @@
+package cn.ezhizao.project.business.service;
+
+
+import cn.ezhizao.project.business.domain.BizFurnaceNoInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+
+/**
+ * 企业租户Service接口
+ *
+ * @author ezhizao
+ * @date 2024-01-30
+ */
+public interface IBizFurnaceNoInfoService extends IService<BizFurnaceNoInfo>
+{
+    /**
+     * 查询企业租户列表
+     *
+     * @param bizFurnaceNoInfo 企业租户
+     * @return 企业租户集合
+     */
+    public List<BizFurnaceNoInfo> getList(BizFurnaceNoInfo bizFurnaceNoInfo);
+
+    /**
+     * 物理删除
+     * @param bizFurnaceNoInfo
+     * @return 删除结果
+     */
+    public int physicalDelete(BizFurnaceNoInfo bizFurnaceNoInfo);
+
+}

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

@@ -0,0 +1,45 @@
+package cn.ezhizao.project.business.service.impl;
+
+import cn.ezhizao.project.business.domain.BizFurnaceNoInfo;
+import cn.ezhizao.project.business.mapper.BizFurnaceNoInfoMapper;
+import cn.ezhizao.project.business.service.IBizFurnaceNoInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * 企业租户Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-01-30
+ */
+@Service
+public class BizFurnaceNoInfoServiceImpl extends ServiceImpl<BizFurnaceNoInfoMapper, BizFurnaceNoInfo> implements IBizFurnaceNoInfoService
+{
+    @Resource
+    private BizFurnaceNoInfoMapper bizFurnaceNoInfoMapper;
+
+    /**
+     * 查询企业租户列表
+     *
+     * @param bizFurnaceNoInfo 企业租户
+     * @return 企业租户
+     */
+    @Override
+    public List<BizFurnaceNoInfo> getList(BizFurnaceNoInfo bizFurnaceNoInfo)
+    {
+        return bizFurnaceNoInfoMapper.getList(bizFurnaceNoInfo);
+    }
+
+    /**
+     * 物理删除
+     * @param bizFurnaceNoInfo
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizFurnaceNoInfo bizFurnaceNoInfo){ return bizFurnaceNoInfoMapper.physicalDelete(bizFurnaceNoInfo); };
+
+}

src/main/java/cn/ezhizao/project/system/service/ISysDeptService.java

@@ -1,6 +1,8 @@
 package cn.ezhizao.project.system.service;
 
+import cn.ezhizao.project.business.domain.BizFurnaceNoInfo;
 import cn.ezhizao.project.system.domain.SysDept;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 

src/main/java/cn/ezhizao/project/system/service/impl/SysDeptServiceImpl.java

@@ -7,11 +7,14 @@ import cn.ezhizao.common.utils.SecurityUtils;
 import cn.ezhizao.common.utils.StringUtils;
 import cn.ezhizao.common.utils.spring.SpringUtils;
 import cn.ezhizao.framework.aspectj.lang.annotation.DataScope;
+import cn.ezhizao.project.business.domain.BizApp;
+import cn.ezhizao.project.business.mapper.BizAppMapper;
 import cn.ezhizao.project.system.domain.SysDept;
 import cn.ezhizao.project.system.domain.SysRole;
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.mapper.SysDeptMapper;
 import cn.ezhizao.project.system.service.ISysDeptService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

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

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.ezhizao.project.business.mapper.BizFurnaceNoInfoMapper">
+
+    <resultMap type="cn.ezhizao.project.business.domain.BizFurnaceNoInfo" id="BizFurnaceNoInfoResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizFurnaceNoInfo" resultType="cn.ezhizao.project.business.domain.BizFurnaceNoInfo">
+        SELECT * FROM biz_furnace_no_info
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="productionPlanNo != null  and productionPlanNo != ''"> AND production_plan_no = #{productionPlanNo}</if>
+            <if test="lineNumber != null  and lineNumber != ''"> AND line_number = #{lineNumber}</if>
+            <if test="factory != null  and factory != ''"> AND factory = #{factory}</if>
+            <if test="furnaceNumber != null  and furnaceNumber != ''"> AND furnace_number = #{furnaceNumber}</if>
+            <if test="brandNumber != null  and brandNumber != ''"> AND brand_number = #{brandNumber}</if>
+            <if test="spec != null  and spec != ''"> AND spec = #{spec}</if>
+            <if test="diameter != null  and diameter != ''"> AND diameter = #{diameter}</if>
+            <if test="shape != null  and shape != ''"> AND shape = #{shape}</if>
+            <if test="firstTechnicalRequirement != null  and firstTechnicalRequirement != ''"> AND first_technical_requirement = #{firstTechnicalRequirement}</if>
+            <if test="secondTechnicalRequirement != null  and secondTechnicalRequirement != ''"> AND second_technical_requirement = #{secondTechnicalRequirement}</if>
+            <if test="rawMaterialCode != null  and rawMaterialCode != ''"> AND raw_material_code = #{rawMaterialCode}</if>
+            <if test="incomingDate != null  and incomingDate != ''"> AND incoming_date = #{incomingDate}</if>
+            <if test="dayworkId != null  and dayworkId != 0"> AND daywork_id = #{dayworkId}</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_furnace_no_info
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+            <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>