|
|
@ -1,5 +1,6 @@ |
|
|
|
package com.win.module.wms.controller.issueRequest; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.win.framework.common.pojo.CustomConditions; |
|
|
|
import com.win.framework.dict.core.util.DictFrameworkUtils; |
|
|
|
import com.win.framework.excel.core.util.ConvertUtil; |
|
|
@ -7,8 +8,16 @@ import com.win.module.system.api.user.AdminUserApi; |
|
|
|
import com.win.module.system.api.user.dto.AdminUserRespDTO; |
|
|
|
import com.win.module.wms.convert.issueRequest.IssueRequestDetailConvert; |
|
|
|
import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestDetailDO; |
|
|
|
import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; |
|
|
|
import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; |
|
|
|
import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; |
|
|
|
import com.win.module.wms.dal.mysql.productionline.ProductionlineMapper; |
|
|
|
import com.win.module.wms.dal.mysql.workshop.WorkshopMapper; |
|
|
|
import com.win.module.wms.dal.mysql.workstation.WorkstationMapper; |
|
|
|
import com.win.module.wms.enums.DictTypeConstants; |
|
|
|
import com.win.module.wms.service.issueRequest.IssueRequestDetailService; |
|
|
|
import com.win.module.wms.service.productionline.ProductionlineService; |
|
|
|
import com.win.module.wms.service.workshop.WorkshopService; |
|
|
|
import io.swagger.v3.oas.annotations.Parameters; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
import javax.annotation.Resource; |
|
|
@ -46,6 +55,15 @@ import org.springframework.web.multipart.MultipartFile; |
|
|
|
@Validated |
|
|
|
public class IssueRequestMainController { |
|
|
|
|
|
|
|
@Resource |
|
|
|
private WorkstationMapper workstationMapper; |
|
|
|
@Resource |
|
|
|
private ProductionlineMapper productionlineMapper; |
|
|
|
@Resource |
|
|
|
private WorkshopService workshopService; |
|
|
|
@Resource |
|
|
|
private WorkshopMapper workshopMapper; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private IssueRequestMainService issueRequestMainService; |
|
|
|
|
|
|
@ -263,6 +281,46 @@ public class IssueRequestMainController { |
|
|
|
return success(count > 0); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("/get-workshop-productionline-workstation") |
|
|
|
@Operation(summary = "获取车间生产线工位树结构") |
|
|
|
@PreAuthorize("@ss.hasPermission('wms:issue-request-main:create')") |
|
|
|
public List getWorkshopProductionlineWorkstation() { |
|
|
|
List list = new ArrayList(); |
|
|
|
List<WorkshopDO> WorkshopList = workshopMapper.selectList(); |
|
|
|
WorkshopList.forEach(workshopItem -> { |
|
|
|
Map<String,Object> mapWorkshop = new HashMap<>(); |
|
|
|
mapWorkshop.put("value", workshopItem.getCode()); |
|
|
|
mapWorkshop.put("label", workshopItem.getName()); |
|
|
|
// 查询该车间下的生产线
|
|
|
|
QueryWrapper queryWrapper = new QueryWrapper(); |
|
|
|
queryWrapper.eq("workshop_code", workshopItem.getCode()); |
|
|
|
List ProductionlineCodeList = new ArrayList(); |
|
|
|
List<ProductionlineDO> ProductionlineList = productionlineMapper.selectList(queryWrapper); |
|
|
|
ProductionlineList.forEach(ProductionlineItem -> { |
|
|
|
Map<String,Object> mapProductionline = new HashMap<>(); |
|
|
|
mapProductionline.put("value", ProductionlineItem.getCode()); |
|
|
|
mapProductionline.put("label", ProductionlineItem.getName()); |
|
|
|
// 查询 该生产线下的工位
|
|
|
|
QueryWrapper queryWrapperProductionline = new QueryWrapper(); |
|
|
|
queryWrapperProductionline.eq("production_line_code", ProductionlineItem.getCode()); |
|
|
|
queryWrapperProductionline.eq("workshop_code", ProductionlineItem.getWorkshopCode()); |
|
|
|
List<WorkstationDO> workstationList = workstationMapper.selectList(queryWrapperProductionline); |
|
|
|
List workstationCodeList = new ArrayList(); |
|
|
|
workstationList.forEach(workstationItem -> { |
|
|
|
Map<String,Object> mapWorkstation = new HashMap<>(); |
|
|
|
mapWorkstation.put("value", workstationItem.getCode()); |
|
|
|
mapWorkstation.put("label", workstationItem.getName()); |
|
|
|
workstationCodeList.add(mapWorkstation); |
|
|
|
}); |
|
|
|
if (workstationCodeList != null && workstationCodeList.size() > 0) mapProductionline.put("children",workstationCodeList); |
|
|
|
ProductionlineCodeList.add(mapProductionline); |
|
|
|
}); |
|
|
|
if (ProductionlineCodeList != null && ProductionlineCodeList.size() > 0) mapWorkshop.put("children",ProductionlineCodeList); |
|
|
|
list.add(mapWorkshop); |
|
|
|
}); |
|
|
|
return list; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/getIssueRequestById") |
|
|
|
@Operation(summary = "APP获得发料申请主子表明细列表") |
|
|
|