11.27

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

@@ -19,7 +19,11 @@ import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceG
 import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupSubPlanService;
 import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail;
 import cn.ezhizao.project.business.technologicalProcessDetail.service.IBizTechnologicalProcessDetailService;
+import cn.ezhizao.project.business.workshop.domain.BizWorkshop;
+import cn.ezhizao.project.business.workshop.service.IBizWorkshopService;
+import cn.ezhizao.project.system.domain.SysDept;
 import cn.ezhizao.project.system.domain.SysUser;
+import cn.ezhizao.project.system.service.ISysDeptService;
 import cn.ezhizao.project.system.service.ISysUserService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.models.auth.In;
@@ -81,6 +85,10 @@ public class BizDayworkController extends BaseController {
     private IBizProductionResourceGroupService bizProductionResourceGroupService;
     @Resource
     private IBizProductionResourceGroupSubPlanService bizProductionResourceGroupSubPlanService;
+    @Resource
+    private ISysDeptService sysDeptService;
+    @Resource
+    private IBizWorkshopService bizWorkshopService;
 
     /*
     @Transactional
@@ -321,6 +329,13 @@ public class BizDayworkController extends BaseController {
             List<Long> protemUserIds = protemResourceGroupDetail.stream().map(BizProductionResourceGroupDetail::getCreatorId).distinct().collect(Collectors.toList());
             protemUserIds.add(0L);
             List<SysUser> sysUsers = sysUserService.selectUserListByIds(protemUserIds);
+            //查找dayworkList工段所在的车间
+            List<Long> deptIds = dayworkList.stream().map(BizDaywork::getDeptId).collect(Collectors.toList());
+            SysDept dept = new SysDept();
+            dept.setDeptIds(deptIds);
+            List<SysDept> sysDeptList = sysDeptService.selectDeptList(dept);
+            List<Long> workshopIds = sysDeptList.stream().map(SysDept::getWorkshopId).collect(Collectors.toList());
+            List<BizWorkshop> workshopList = bizWorkshopService.query().in("id", workshopIds).list();
             for (BizDaywork daywork : dayworkList) {
                 //把批次的lot投产数量加到daywork里
                 allLots.stream().filter(l -> l.getId().equals(daywork.getLotId()))
@@ -334,7 +349,9 @@ public class BizDayworkController extends BaseController {
                         .sorted(Comparator.comparing(BizDayworkItem::getCreateTime).reversed())
                         .collect(Collectors.toList());
                 daywork.setDayworkItemList(tempDayworkItems);
-
+                /* ************************** 配置当前工段车间 ************************** */
+                SysDept sysDept = sysDeptList.stream().filter(v -> v.getDeptId().equals(daywork.getDeptId())).findFirst().orElse(null);
+                daywork.setWorkshopName(workshopList.stream().filter(w -> w.getId().equals(sysDept.getWorkshopId())).findFirst().orElse(null).getName());
                 /* ************************** 获取【daywork】所匹配的材质 ************************** */
                 BizFurnaceNoInfo furnaceNoInfo = furnaceNoInfos.stream()
                         .filter(di -> di.getDayworkId().equals(daywork.getId()))

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

@@ -225,4 +225,6 @@ public class BizDaywork extends BaseEntity
     private Long packageResourceGroupId;
     @TableField(exist = false)
     private List<Long> productionPlanDetailIds;
+    @TableField(exist = false)
+    private String workshopName;
 }