|
|
@ -4,6 +4,9 @@ import com.win.framework.common.pojo.CustomConditions; |
|
|
|
import com.win.module.system.api.user.AdminUserApi; |
|
|
|
import com.win.module.system.api.user.dto.AdminUserRespDTO; |
|
|
|
import com.win.module.wms.controller.transferissueJob.vo.*; |
|
|
|
import com.win.module.wms.convert.transferissueJob.TransferissueJobDetailConvert; |
|
|
|
import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO; |
|
|
|
import com.win.module.wms.service.transferissueJob.TransferissueJobDetailService; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
import javax.annotation.Resource; |
|
|
|
import org.springframework.validation.annotation.Validated; |
|
|
@ -26,7 +29,6 @@ import com.win.framework.excel.core.util.ExcelUtils; |
|
|
|
import com.win.framework.operatelog.core.annotations.OperateLog; |
|
|
|
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; |
|
|
|
|
|
|
|
import com.win.module.wms.controller.transferissueJob.vo.*; |
|
|
|
import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobMainDO; |
|
|
|
import com.win.module.wms.convert.transferissueJob.TransferissueJobMainConvert; |
|
|
|
import com.win.module.wms.service.transferissueJob.TransferissueJobMainService; |
|
|
@ -40,6 +42,9 @@ public class TransferissueJobMainController { |
|
|
|
@Resource |
|
|
|
private TransferissueJobMainService transferissueJobMainService; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private TransferissueJobDetailService transferissueJobDetailService; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private AdminUserApi userApi; |
|
|
|
|
|
|
@ -122,4 +127,22 @@ public class TransferissueJobMainController { |
|
|
|
ExcelUtils.write(response, "调拨出库任务主.xls", "数据", TransferissueJobMainExcelVO.class, datas); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("/getTransferissueJobById") |
|
|
|
@Operation(summary = "APP获得调拨出库主子表明细列表") |
|
|
|
@Parameter(name = "id", description = "编号", required = true, example = "1024") |
|
|
|
@PreAuthorize("@ss.hasPermission('wms:transferissue-job-main:query')") |
|
|
|
public CommonResult<TransferissueJobMainRespVO> getTransferissueJobById(@RequestParam("id") Long id) { |
|
|
|
TransferissueJobMainDO transferissueJobMain = transferissueJobMainService.getTransferissueJobMain(id); |
|
|
|
TransferissueJobMainRespVO result = TransferissueJobMainConvert.INSTANCE.convert(transferissueJobMain); |
|
|
|
if(result==null) { |
|
|
|
return success(result); |
|
|
|
}; |
|
|
|
TransferissueJobDetailExportReqVO exportReqVO = new TransferissueJobDetailExportReqVO(); |
|
|
|
exportReqVO.setMasterId(result.getId()); |
|
|
|
List<TransferissueJobDetailDO> transferissueJobDetailList = transferissueJobDetailService.getTransferissueJobDetailList(exportReqVO); |
|
|
|
List<TransferissueJobDetailExcelVO> transferissueJobDetailExcelVOS = TransferissueJobDetailConvert.INSTANCE.convertList02(transferissueJobDetailList); |
|
|
|
result.setSubList(transferissueJobDetailExcelVOS); |
|
|
|
return success(result); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|