|
|
@ -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.transferreceiptJob.vo.*; |
|
|
|
import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobDetailConvert; |
|
|
|
import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDetailDO; |
|
|
|
import com.win.module.wms.service.transferreceiptJob.TransferreceiptJobDetailService; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
import javax.annotation.Resource; |
|
|
|
import org.springframework.validation.annotation.Validated; |
|
|
@ -34,6 +37,9 @@ public class TransferreceiptJobMainController { |
|
|
|
@Resource |
|
|
|
private TransferreceiptJobMainService transferreceiptJobMainService; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private TransferreceiptJobDetailService transferreceiptJobDetailService; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private AdminUserApi userApi; |
|
|
|
|
|
|
@ -118,4 +124,22 @@ public class TransferreceiptJobMainController { |
|
|
|
ExcelUtils.write(response, "调拨入库任务主.xls", "数据", TransferreceiptJobMainExcelVO.class, datas); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("/getTransferreceiptJobById") |
|
|
|
@Operation(summary = "APP获得调拨入库主子表明细列表") |
|
|
|
@Parameter(name = "id", description = "编号", required = true, example = "1024") |
|
|
|
@PreAuthorize("@ss.hasPermission('wms:transferreceipt-job-main:query')") |
|
|
|
public CommonResult<TransferreceiptJobMainRespVO> getTransferreceiptJobById(@RequestParam("id") Long id) { |
|
|
|
TransferreceiptJobMainDO transferreceiptJobMain = transferreceiptJobMainService.getTransferreceiptJobMain(id); |
|
|
|
TransferreceiptJobMainRespVO result = TransferreceiptJobMainConvert.INSTANCE.convert(transferreceiptJobMain); |
|
|
|
if(result==null) { |
|
|
|
return success(result); |
|
|
|
}; |
|
|
|
TransferreceiptJobDetailExportReqVO exportReqVO = new TransferreceiptJobDetailExportReqVO(); |
|
|
|
exportReqVO.setMasterId(result.getId()); |
|
|
|
List<TransferreceiptJobDetailDO> transferreceiptJobDetailList = transferreceiptJobDetailService.getTransferreceiptJobDetailList(exportReqVO); |
|
|
|
List<TransferreceiptJobDetailExcelVO> transferreceiptJobDetailExcelVOS = TransferreceiptJobDetailConvert.INSTANCE.convertList02(transferreceiptJobDetailList); |
|
|
|
result.setSubList(transferreceiptJobDetailExcelVOS); |
|
|
|
return success(result); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|