Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/cn/ezhizao/project/business/product/controller/BizProcessInspecionController.java

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkItemController.java

@@ -455,6 +455,9 @@ public class BizDayworkItemController extends BaseController {
                 daywork.setTemporaryProcessQualifiedNum(lastDayworkItem.stream().mapToInt(BizDayworkItem::getQualifiedNum).sum());
                 //周转的报工信息
                 BizDayworkItem turnoverItem = dayworkItem.stream().filter(item -> item.getProcessStepNumber().equals(lastProcessStepNumber) && item.getStatus().equals("4")).collect(Collectors.toList()).get(0);
+                daywork.setDayworkItemList(new ArrayList<BizDayworkItem>() {{
+                    add(turnoverItem);
+                }});
                 //周转位置
                 daywork.setPlace(turnoverItem.getTurnoverArea());
                 //设置操作者

src/main/java/cn/ezhizao/project/business/product/controller/BizProcessInspecionController.java

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.ezhizao.common.utils.bean.BeanUtils;
 import cn.ezhizao.common.utils.poi.ExcelUtil;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
 import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
@@ -25,7 +26,6 @@ import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnolo
 import cn.ezhizao.project.business.technologicalProcessDetail.service.IBizTechnologicalProcessDetailService;
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.service.ISysUserService;
-import cn.hutool.core.date.DateTime;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -92,10 +92,6 @@ public class BizProcessInspecionController extends BaseController {
     private IBizOutsourcedOrderDetailService bizOutsourcedOrderDetailService;
     @Resource
     private IBizOutsourcedOrderDetailProcessService bizOutsourcedOrderDetailProcessService;
-    @Resource
-    private RedisCache redisCache;
-
-    final private String processInspectionNoKey = "processInspectionCode";
 
     /**
      * 查询序检主列表
@@ -294,34 +290,55 @@ public class BizProcessInspecionController extends BaseController {
         bizDayworkItemRejectService.saveBatch(rejects);
         //保存咨询信息
 
-        List<BizDayworkItemConsult> consults = processInspecion.getDayworkItemConsults();
+        List<BizDayworkItemConsult> consults = processInspecion.getDayworkItemConsults().stream().filter(item-> item.getId()==null).collect(Collectors.toList());
+        List<BizDayworkItemConsult> needAdd = new ArrayList<>();
         if (consults != null && consults.size() > 0) {
             for (BizDayworkItemConsult consult : consults) {
-                consult.setUserId(user == null ? 0L : user.getUserId());
-                consult.setNickName(user == null ? "" : user.getNickName());
-                consult.setDayworkId(daywork.getId());
-                consult.setProcessInspectionId(processInspecion.getId());
-                consult.setProductionPlanId(daywork.getProductionPlanId());
-                consult.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
-                consult.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
-                consult.setLotId(processInspecion.getLot().getId());
-                consult.setLotCode(processInspecion.getLot().getLotCode());
-                consult.setDayworkId(daywork.getId());
-                consult.setDayworkItemId(dayworkItem.getId());
-                consult.setProductId(processInspecion.getLot().getProductId());
-                consult.setProductDescription(processInspecion.getLot().getProductDescription());
-                consult.setTechnologicalProcessId(processInspecion.getLot().getTechnologicalProcessId());
-                consult.setTechnologicalProcessDetailId(dayworkItem.getTechnologicalProcessDetailId());
-                consult.setProcessId(dayworkItem.getProcessId());
-                consult.setProcessAlias(processInspecion.getLot().getProcessAlias());
-                consult.setIsOutsourcedInspection(1);
-                consult.setTechnicianId(technicianUser == null ? 0L : technicianUser.getUserId());
+                    BizDayworkItemConsult consultInfo = new BizDayworkItemConsult();
+                    consultInfo.setStatus(consult.getStatus());
+                    consultInfo.setContent(consult.getContent());
+                    consultInfo.setConsultDepartment(consult.getConsultDepartment());
+                    consultInfo.setUserId(user == null ? 0L : user.getUserId());
+                    consultInfo.setNickName(user == null ? "" : user.getNickName());
+                    consultInfo.setDayworkId(daywork.getId());
+                    consultInfo.setProcessInspectionId(processInspecion.getId());
+                    consultInfo.setProductionPlanId(daywork.getProductionPlanId());
+                    consultInfo.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
+                    consultInfo.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
+                    consultInfo.setLotId(processInspecion.getLot().getId());
+                    consultInfo.setLotCode(processInspecion.getLot().getLotCode());
+                    consultInfo.setDayworkId(daywork.getId());
+                    consultInfo.setDayworkItemId(dayworkItem.getId());
+                    consultInfo.setProductId(processInspecion.getLot().getProductId());
+                    consultInfo.setProductDescription(processInspecion.getLot().getProductDescription());
+                    consultInfo.setTechnologicalProcessId(processInspecion.getLot().getTechnologicalProcessId());
+                    consultInfo.setTechnologicalProcessDetailId(dayworkItem.getTechnologicalProcessDetailId());
+                    consultInfo.setProcessId(dayworkItem.getProcessId());
+                    consultInfo.setProcessAlias(processInspecion.getLot().getProcessAlias());
+                    consultInfo.setIsOutsourcedInspection(1);
+                    consultInfo.setTechnicianId(technicianUser == null ? 0L : technicianUser.getUserId());
+                    needAdd.add(consultInfo);
             }
+            bizDayworkItemConsultService.saveBatch(needAdd);
+            List<BizDayworkItemConsultPicture> pictures = new ArrayList<>();
+            needAdd.forEach(ne ->{
+                consults.forEach(item ->{
+                    item.getPictures().forEach(info ->{
+                        BizDayworkItemConsultPicture consultPicture = new BizDayworkItemConsultPicture();
+                        consultPicture.setDayworkItemConsultId(ne.getId());
+                        consultPicture.setPictureName(info.getPictureName());
+                        consultPicture.setUrl(info.getUrl());
+                        pictures.add(consultPicture);
+                    });
+                });
+            });
+            bizDayworkItemConsultPictureService.saveBatch(pictures);
         }
 
+
         //修改daywaork信息
         dayworkItem.setIsProcessInspection(1);
-        return success(bizDayworkItemService.saveOrUpdate(dayworkItem) && bizDayworkItemConsultService.saveOrUpdateBatch(consults));
+        return success(bizDayworkItemService.saveOrUpdate(dayworkItem) );
     }
     @PostMapping("/getProcessInspectionByDayworkId")
     public AjaxResult getProcessInspectionByDayworkId(@RequestBody BizProcessInspecion processInspecion) {
@@ -426,34 +443,54 @@ public class BizProcessInspecionController extends BaseController {
         bizDayworkItemRejectService.saveBatch(rejects);
         //保存咨询信息
 
-        List<BizDayworkItemConsult> consults = processInspecion.getDayworkItemConsults();
+        List<BizDayworkItemConsult> consults = processInspecion.getDayworkItemConsults().stream().filter(item-> item.getId()==null).collect(Collectors.toList());
+        List<BizDayworkItemConsult> needAdd = new ArrayList<>();
         if (consults != null && consults.size() > 0) {
             for (BizDayworkItemConsult consult : consults) {
-                consult.setUserId(user == null ? 0L : user.getUserId());
-                consult.setNickName(user == null ? "" : user.getNickName());
-                consult.setDayworkId(daywork.getId());
-                consult.setProcessInspectionId(processInspecion.getId());
-                consult.setProductionPlanId(daywork.getProductionPlanId());
-                consult.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
-                consult.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
-                consult.setLotId(processInspecion.getLot().getId());
-                consult.setLotCode(processInspecion.getLot().getLotCode());
-                consult.setDayworkId(daywork.getId());
-                consult.setDayworkItemId(dayworkItem.getId());
-                consult.setProductId(processInspecion.getLot().getProductId());
-                consult.setProductDescription(processInspecion.getLot().getProductDescription());
-                consult.setTechnologicalProcessId(processInspecion.getLot().getTechnologicalProcessId());
-                consult.setTechnologicalProcessDetailId(dayworkItem.getTechnologicalProcessDetailId());
-                consult.setProcessId(dayworkItem.getProcessId());
-                consult.setProcessAlias(processInspecion.getLot().getProcessAlias());
-                consult.setIsProcessInspection(1);
-                consult.setTechnicianId(technicianUser == null ? 0L : technicianUser.getUserId());
+                    BizDayworkItemConsult consultInfo = new BizDayworkItemConsult();
+                    consultInfo.setConsultDepartment(consult.getConsultDepartment());
+                    consultInfo.setUserId(user == null ? 0L : user.getUserId());
+                    consultInfo.setNickName(user == null ? "" : user.getNickName());
+                    consultInfo.setDayworkId(daywork.getId());
+                    consultInfo.setContent(consult.getContent());
+                    consultInfo.setProcessInspectionId(processInspecion.getId());
+                    consultInfo.setProductionPlanId(daywork.getProductionPlanId());
+                    consultInfo.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
+                    consultInfo.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
+                    consultInfo.setLotId(processInspecion.getLot().getId());
+                    consultInfo.setLotCode(processInspecion.getLot().getLotCode());
+                    consultInfo.setDayworkId(daywork.getId());
+                    consultInfo.setDayworkItemId(dayworkItem.getId());
+                    consultInfo.setProductId(processInspecion.getLot().getProductId());
+                    consultInfo.setProductDescription(processInspecion.getLot().getProductDescription());
+                    consultInfo.setTechnologicalProcessId(processInspecion.getLot().getTechnologicalProcessId());
+                    consultInfo.setTechnologicalProcessDetailId(dayworkItem.getTechnologicalProcessDetailId());
+                    consultInfo.setProcessId(dayworkItem.getProcessId());
+                    consultInfo.setProcessAlias(processInspecion.getLot().getProcessAlias());
+                    consultInfo.setIsProcessInspection(1);
+                    consultInfo.setTechnicianId(technicianUser == null ? 0L : technicianUser.getUserId());
+                    consultInfo.setStatus(consult.getStatus());
+                    consultInfo.setPictures(consult.getPictures());
+                    needAdd.add(consultInfo);
             }
+            bizDayworkItemConsultService.saveBatch(needAdd);
+            List<BizDayworkItemConsultPicture> pictures = new ArrayList<>();
+            needAdd.forEach(ne ->{
+                    ne.getPictures().forEach(info ->{
+                        BizDayworkItemConsultPicture consultPicture = new BizDayworkItemConsultPicture();
+                        consultPicture.setDayworkItemConsultId(ne.getId());
+                        consultPicture.setPictureName(info.getPictureName());
+                        consultPicture.setUrl(info.getUrl());
+                        pictures.add(consultPicture);
+                    });
+            });
+            bizDayworkItemConsultPictureService.saveBatch(pictures);
         }
 
+
         //修改daywaork信息
         dayworkItem.setIsProcessInspection(1);
-        return success(bizDayworkItemService.saveOrUpdate(dayworkItem) && bizDayworkItemConsultService.saveOrUpdateBatch(consults));
+        return success(bizDayworkItemService.saveOrUpdate(dayworkItem) );
     }
 
     private boolean checkOutsourceDayworkItem(Long outsourceOrderDetailId) {
@@ -749,36 +786,55 @@ public class BizProcessInspecionController extends BaseController {
         bizDayworkItemRejectService.save(newRej);
         //保存咨询信息
 
-        List<BizDayworkItemConsult> consults = processInspecion.getDayworkItemConsults();
+        List<BizDayworkItemConsult> consults = processInspecion.getDayworkItemConsults().stream().filter(item-> item.getId()==null).collect(Collectors.toList());
+        List<BizDayworkItemConsult> needAdd = new ArrayList<>();
         if (consults != null && consults.size() > 0) {
             for (BizDayworkItemConsult consult : consults) {
-                consult.setUserId(user == null ? 0L : user.getUserId());
-                consult.setNickName(user == null ? "" : user.getNickName());
-                consult.setDayworkId(daywork.getId());
-                consult.setProcessInspectionId(processInspecion.getId());
-                consult.setProductionPlanId(daywork.getProductionPlanId());
-                consult.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
-                consult.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
-                consult.setLotId(processInspecion.getLot().getId());
-                consult.setLotCode(processInspecion.getLot().getLotCode());
-                consult.setDayworkId(daywork.getId());
-                consult.setDayworkItemId(dayworkItem.getId());
-                consult.setProductId(processInspecion.getLot().getProductId());
-                consult.setProductDescription(processInspecion.getLot().getProductDescription());
-                consult.setTechnologicalProcessId(processInspecion.getLot().getTechnologicalProcessId());
-                consult.setTechnologicalProcessDetailId(dayworkItem.getTechnologicalProcessDetailId());
-                consult.setProcessId(dayworkItem.getProcessId());
-                consult.setProcessAlias(processInspecion.getLot().getProcessAlias());
-                consult.setIsOutsourcedInspection(1);
-                consult.setTechnicianId(technicianUser == null ? 0L : technicianUser.getUserId());
+                BizDayworkItemConsult consultInfo = new BizDayworkItemConsult();
+                consultInfo.setPictures(consult.getPictures());
+                consultInfo.setUserId(user == null ? 0L : user.getUserId());
+                consultInfo.setNickName(user == null ? "" : user.getNickName());
+                consultInfo.setDayworkId(daywork.getId());
+                consultInfo.setContent(consult.getContent());
+                consultInfo.setConsultDepartment(consult.getConsultDepartment());
+                consultInfo.setProcessInspectionId(processInspecion.getId());
+                consultInfo.setProductionPlanId(daywork.getProductionPlanId());
+                consultInfo.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
+                consultInfo.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
+                consultInfo.setLotId(processInspecion.getLot().getId());
+                consultInfo.setLotCode(processInspecion.getLot().getLotCode());
+                consultInfo.setDayworkId(daywork.getId());
+                consultInfo.setDayworkItemId(dayworkItem.getId());
+                consultInfo.setProductId(processInspecion.getLot().getProductId());
+                consultInfo.setProductDescription(processInspecion.getLot().getProductDescription());
+                consultInfo.setTechnologicalProcessId(processInspecion.getLot().getTechnologicalProcessId());
+                consultInfo.setTechnologicalProcessDetailId(dayworkItem.getTechnologicalProcessDetailId());
+                consultInfo.setProcessId(dayworkItem.getProcessId());
+                consultInfo.setProcessAlias(processInspecion.getLot().getProcessAlias());
+                consultInfo.setIsOutsourcedInspection(1);
+                consultInfo.setTechnicianId(technicianUser == null ? 0L : technicianUser.getUserId());
+                needAdd.add(consultInfo);
             }
+            bizDayworkItemConsultService.saveBatch(needAdd);
+            List<BizDayworkItemConsultPicture> pictures = new ArrayList<>();
+            needAdd.forEach(ne ->{
+                ne.getPictures().forEach(info ->{
+                        BizDayworkItemConsultPicture consultPicture = new BizDayworkItemConsultPicture();
+                        consultPicture.setDayworkItemConsultId(ne.getId());
+                        consultPicture.setPictureName(info.getPictureName());
+                        consultPicture.setUrl(info.getUrl());
+                        pictures.add(consultPicture);
+                    });
+            });
+            bizDayworkItemConsultPictureService.saveBatch(pictures);
         }
 
         //修改daywaork信息
         dayworkItem.setIsProcessInspection(1);
-        return success(bizDayworkItemService.saveOrUpdate(dayworkItem) && bizDayworkItemConsultService.saveOrUpdateBatch(consults));
+        return success(bizDayworkItemService.saveOrUpdate(dayworkItem));
     }
 
+
 //    /**
 //     * 根据箱号查询是否为一箱多批
 //     */

src/main/java/cn/ezhizao/project/business/product/controller/SortDayworkController.java

@@ -1,5 +1,6 @@
 package cn.ezhizao.project.business.product.controller;
 
+import cn.ezhizao.common.utils.bean.BeanUtils;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.project.business.inspection.domain.BizInspectionInstruction;
@@ -15,6 +16,7 @@ import cn.ezhizao.project.business.technologicalProcessDetail.service.IBizTechno
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.service.ISysUserService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.context.annotation.Bean;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -57,6 +59,8 @@ public class SortDayworkController extends BaseController {
     private IBizTechnologicalProcessService bizTechnologicalProcessService;
     @Resource
     private ISysUserService sysUserService;
+    @Resource
+    private IBizDayworkItemConsultPictureService bizDayworkItemConsultPictureService;
     // 修改报工状态为开始
     @PostMapping("/start")
     public AjaxResult start(@RequestBody BizDaywork bizDaywork) {
@@ -126,13 +130,35 @@ public class SortDayworkController extends BaseController {
     }
 
     @PostMapping("saveConsult")
+    @Transactional
     public AjaxResult saveConsult(@RequestBody BizDayworkItemConsult bizDayworkItemConsult) {
-        if (bizDayworkItemConsultService.save(bizDayworkItemConsult)){
+            List<BizDayworkItemConsult> needAdd = new ArrayList<>();
+            bizDayworkItemConsult.getDepartments().forEach(item ->{
+                BizDayworkItemConsult consult = new BizDayworkItemConsult();
+                BeanUtils.copyProperties(bizDayworkItemConsult,consult);
+                consult.setConsultDepartment(item);
+                needAdd.add(consult);
+        });
+            bizDayworkItemConsultService.saveBatch(needAdd);
+            List<BizDayworkItemConsultPicture> pictures = new ArrayList<>();
+            for(int i = 0;i<needAdd.size();i++) {
+                for(int j = 0;j<bizDayworkItemConsult.getPictures().size();j++) {
+                    BizDayworkItemConsultPicture consultPicture = new BizDayworkItemConsultPicture();
+                    consultPicture.setDayworkItemConsultId(needAdd.get(i).getId());
+                    consultPicture.setPictureName(bizDayworkItemConsult.getPictures().get(j).getPictureName());
+                    consultPicture.setUrl(bizDayworkItemConsult.getPictures().get(j).getUrl());
+                    pictures.add(consultPicture);
+                }
+            }
+        bizDayworkItemConsultPictureService.saveBatch(pictures);
             List<BizDayworkItemConsult> bizDayworkItemConsults = bizDayworkItemConsultService.query().eq("daywork_item_id", bizDayworkItemConsult.getDayworkItemId()).list();
-            return success(bizDayworkItemConsults);
-        } else {
-            return error("咨询提交失败");
-        }
+             List<Long> consultIds = bizDayworkItemConsults.stream().map(BizDayworkItemConsult::getId).collect(Collectors.toList());
+        List<BizDayworkItemConsultPicture> consultPictures = bizDayworkItemConsultPictureService.query().in("daywork_item_consult_id", consultIds.isEmpty() ? Collections.singletonList("0") : consultIds).list();
+        bizDayworkItemConsults.forEach(info ->{
+            List<BizDayworkItemConsultPicture> pic = consultPictures.stream().filter(picture -> picture.getDayworkItemConsultId().equals(info.getId())).collect(Collectors.toList());
+            info.setPictures(pic);
+        });
+        return success(bizDayworkItemConsults);
     }
 
     @PostMapping("update")

src/main/java/cn/ezhizao/project/business/product/domain/BizDayworkItemConsult.java

@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 废品原因对象 biz_daywork_item_consult
  *
@@ -91,5 +93,9 @@ public class BizDayworkItemConsult extends BaseEntity
     private Long technicianId;
     @TableField(exist = false)
     private String technicianName;
-
+    private Integer consultDepartment;
+    @TableField(exist = false)
+    private List<Integer> departments;
+    @TableField(exist = false)
+    private List<BizDayworkItemConsultPicture> pictures;
 }

src/main/java/cn/ezhizao/project/business/product/domain/BizDayworkItemConsultPicture.java

@@ -0,0 +1,39 @@
+package cn.ezhizao.project.business.product.domain;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 咨询图片对象 biz_daywork_item_consult_picture
+ *
+ * @author ezhizao
+ * @date 2024-07-22
+ */
+@Data
+@TableName(value = "biz_daywork_item_consult_picture")
+public class BizDayworkItemConsultPicture extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 租户id，厂别或类型1:Ⅰ类2：Ⅱ类 */
+    @ApiModelProperty(value = "${comment}")
+    private Long tenantId;
+
+    /** 报工咨询id */
+    @ApiModelProperty(value = "${comment}")
+    private Long dayworkItemConsultId;
+
+    /** 图片地址 */
+    @Excel(name = "图片地址")
+    @ApiModelProperty(value = "图片地址")
+    private String url;
+
+    /** 图片名称 */
+    @Excel(name = "图片名称")
+    @ApiModelProperty(value = "图片名称")
+    private String pictureName;
+
+}

src/main/java/cn/ezhizao/project/business/product/mapper/BizDayworkItemConsultPictureMapper.java

@@ -0,0 +1,30 @@
+package cn.ezhizao.project.business.product.mapper;
+
+import java.util.List;
+
+import cn.ezhizao.project.business.product.domain.BizDayworkItemConsultPicture;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 咨询图片Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-07-22
+ */
+public interface BizDayworkItemConsultPictureMapper extends BaseMapper<BizDayworkItemConsultPicture>
+{
+    /**
+     * 查询咨询图片列表
+     *
+     * @param bizDayworkItemConsultPicture 咨询图片
+     * @return 咨询图片集合
+     */
+    public List<BizDayworkItemConsultPicture> getList(BizDayworkItemConsultPicture bizDayworkItemConsultPicture);
+
+    /**
+     * 物理删除
+     * @param bizDayworkItemConsultPicture
+     * @return 删除结果
+    */
+    public int physicalDelete(BizDayworkItemConsultPicture bizDayworkItemConsultPicture);
+}

src/main/java/cn/ezhizao/project/business/product/service/IBizDayworkItemConsultPictureService.java

@@ -0,0 +1,31 @@
+package cn.ezhizao.project.business.product.service;
+
+import java.util.List;
+
+import cn.ezhizao.project.business.product.domain.BizDayworkItemConsultPicture;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 咨询图片Service接口
+ *
+ * @author ezhizao
+ * @date 2024-07-22
+ */
+public interface IBizDayworkItemConsultPictureService extends IService<BizDayworkItemConsultPicture>
+{
+    /**
+     * 查询咨询图片列表
+     *
+     * @param bizDayworkItemConsultPicture 咨询图片
+     * @return 咨询图片集合
+     */
+    public List<BizDayworkItemConsultPicture> getList(BizDayworkItemConsultPicture bizDayworkItemConsultPicture);
+
+    /**
+     * 物理删除
+     * @param bizDayworkItemConsultPicture
+     * @return 删除结果
+     */
+    public int physicalDelete(BizDayworkItemConsultPicture bizDayworkItemConsultPicture);
+
+}

src/main/java/cn/ezhizao/project/business/product/service/impl/BizDayworkItemConsultPictureServiceImpl.java

@@ -0,0 +1,45 @@
+package cn.ezhizao.project.business.product.service.impl;
+
+import java.util.List;
+import javax.annotation.Resource;
+
+import cn.ezhizao.project.business.product.domain.BizDayworkItemConsultPicture;
+import cn.ezhizao.project.business.product.mapper.BizDayworkItemConsultPictureMapper;
+import cn.ezhizao.project.business.product.service.IBizDayworkItemConsultPictureService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 咨询图片Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-07-22
+ */
+@Service
+public class BizDayworkItemConsultPictureServiceImpl  extends ServiceImpl<BizDayworkItemConsultPictureMapper, BizDayworkItemConsultPicture> implements IBizDayworkItemConsultPictureService
+{
+    @Resource
+    private BizDayworkItemConsultPictureMapper bizDayworkItemConsultPictureMapper;
+
+    /**
+     * 查询咨询图片列表
+     *
+     * @param bizDayworkItemConsultPicture 咨询图片
+     * @return 咨询图片
+     */
+    @Override
+    public List<BizDayworkItemConsultPicture> getList(BizDayworkItemConsultPicture bizDayworkItemConsultPicture)
+    {
+        return bizDayworkItemConsultPictureMapper.getList(bizDayworkItemConsultPicture);
+    }
+
+    /**
+     * 物理删除
+     * @param bizDayworkItemConsultPicture
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizDayworkItemConsultPicture bizDayworkItemConsultPicture){ return bizDayworkItemConsultPictureMapper.physicalDelete(bizDayworkItemConsultPicture); };
+
+}

src/main/java/cn/ezhizao/project/business/technologicalProcess/controller/BizTechnologicalProcessController.java

@@ -66,7 +66,6 @@ public class BizTechnologicalProcessController extends BaseController
     /**
      * 获取工艺主表详细信息
      */
-    @PreAuthorize("@ss.hasPermi('base:technologicalProcess:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/domain/BizTechnologicalProcessDetailDrawing.java

@@ -98,5 +98,14 @@ public class BizTechnologicalProcessDetailDrawing extends BaseEntity
     private String specification;
     @TableField(exist = false)
     private String drawingNumber;
+    /** 产品id */
+    @ApiModelProperty(value = "${comment}")
+    private Long productId;
+
+    @ApiModelProperty(value = "工序编码")
+    private String processCode;
+    @Excel(name = "工艺版本")
+    @ApiModelProperty(value = "工艺版本编码")
+    private String productVersion;
 
 }

src/main/resources/application-dev.yml

@@ -88,3 +88,6 @@ file:
     type: xlsx,xls,txt,jpeg,jpg,doc,ppt,pptx,png,pdf,rar,zip,wps,gif,docx #支持的文件类型
   excelTemplate:
     url: D://Ezhizao//dms//templates/
+# 文件上传
+ruoyi:
+  profile: D:/Ezhizao/identity/

src/main/resources/application-linux.yml

@@ -92,3 +92,6 @@ file:
         type: xlsx,xls,txt,jpeg,jpg,doc,ppt,pptx,png,pdf,rar,zip,wps,gif,docx #支持的文件类型
     excelTemplate:
         url: D://Ezhizao//dms//templates/
+# 文件上传
+ruoyi:
+    profile: /home/files/dms/

src/main/resources/mybatis/business/product/BizDayworkItemConsultPictureMapper.xml

@@ -0,0 +1,30 @@
+<?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.product.mapper.BizDayworkItemConsultPictureMapper">
+
+    <resultMap type="cn.ezhizao.project.business.product.domain.BizDayworkItemConsultPicture" id="BizDayworkItemConsultPictureResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizDayworkItemConsultPicture" resultMap="BizDayworkItemConsultPictureResult">
+        SELECT * FROM biz_daywork_item_consult_picture
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="url != null  and url != ''"> AND url = #{url}</if>
+            <if test="pictureName != null  and pictureName != ''"> AND picture_name like concat('%', #{pictureName}, '%')</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_daywork_item_consult_picture
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>

src/main/resources/mybatis/business/technologicalProcessDetailDrawing/BizTechnologicalProcessDetailDrawingMapper.xml

@@ -7,22 +7,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="cn.ezhizao.project.business.technologicalProcessDetailDrawing.domain.BizTechnologicalProcessDetailDrawing" id="BizTechnologicalProcessDetailDrawingResult">
         <id column="id" property="id"/>
         <result column="technological_process_detail_id" property="technologicalProcessDetailId"/>
-        <association property="product" column="technological_process_detail_id"  javaType="cn.ezhizao.project.business.product.domain.BizProduct" select="getProduct"/>
-        <association property="technologyVersion" column="technological_process_detail_id" javaType="java.lang.String" select="getVersion"/>
-        <association property="processAlias" column="technological_process_detail_id" javaType="java.lang.String" select="getProcessAlias"/>
+        <result column="process_code" property="processCode"/>
+        <result column="product_id" property="productId"/>
+        <association property="product" column="product_id"  javaType="cn.ezhizao.project.business.product.domain.BizProduct" select="getProduct"/>
+        <association property="processAlias" column="process_code" javaType="java.lang.String" select="getProcessAlias"/>
     </resultMap>
     <resultMap id="BizProductResult" type="cn.ezhizao.project.business.product.domain.BizProduct">
         <id column="id" property="id"/>
     </resultMap>
     <select id="getProcessAlias" resultType="java.lang.String">
-        select process_alias from biz_technological_process_detail where deleted = 0 and id = #{technologicalProcessDetailId}
+        select process_alias from biz_process where deleted = 0 and process_code = #{processCode}
     </select>
 
-    <select id="getVersion" resultType="java.lang.String">
-        select technology_version from biz_technological_process_detail where deleted = 0 and id = #{technologicalProcessDetailId}
-    </select>
     <select id="getProduct" resultMap="BizProductResult">
-        select * from biz_product where deleted = 0 and id = (select DISTINCT product_id from biz_technological_process_detail where deleted = 0 and id = #{technologicalProcessDetailId})
+        select * from biz_product where deleted = 0 and id =#{productId}
     </select>
 
     <select id="getList" parameterType="BizTechnologicalProcessDetailDrawing" resultMap="BizTechnologicalProcessDetailDrawingResult">
@@ -30,8 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0
             <if test="url != null  and url != ''"> AND url = #{url}</if>
-
-            <if test="technologicalProcessDetailId != null  and technologicalProcessDetailId != ''"> AND technological_process_detail_id = #{technologicalProcessDetailId}</if>
+            <if test="productId != null">and product_id = #{productId} </if>
+            <if test="productVersion != null and productVersion !=''">AND product_version = #{productVersion}</if>
+            <if test="processCode != null and processCode != ''">AND process_code = #{processCode}</if>
             <if test="drawingName != null  and drawingName != ''"> AND drawing_name = #{drawingName}</if>
             <if test="technologicalProcessId !=null and technologicalProcessId !=''">AND technological_process_detail_id IN (select id from biz_technological_process_detail where deleted = 0  AND technological_process_id = #{technologicalProcessId})</if>
         </trim>