|
|
@@ -21,6 +21,7 @@ import com.cnbm.packing.excel.WoPackagingBoxSubstrateExcel; |
|
|
|
import com.cnbm.packing.excel.WoPackagingBoxSubstrateManualExcel; |
|
|
|
import com.cnbm.packing.mapper.WoPackagingBoxMapper; |
|
|
|
import com.cnbm.packing.mapper.WoPackagingBoxSubstrateMapper; |
|
|
|
import com.cnbm.packing.param.PackingInfoQueryParam; |
|
|
|
import com.cnbm.packing.param.PowerReportQueryParam; |
|
|
|
import com.cnbm.packing.service.WoPackagingBoxServiceBiz; |
|
|
|
import com.cnbm.packing.service.WoPackagingBoxSubstrateServiceBiz; |
|
|
@@ -334,18 +335,11 @@ public class WoPackagingBoxSubstrateController { |
|
|
|
return new Result(); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("substrateList") |
|
|
|
@PostMapping("substrateList") |
|
|
|
@ApiOperation("装箱单信息查询") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataTypeClass = LocalDateTime.class), |
|
|
|
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataTypeClass = LocalDateTime.class), |
|
|
|
@ApiImplicitParam(name = "model", value = "模式,1-手动模式;2-自动模式", paramType = "query", dataTypeClass = Integer.class), |
|
|
|
@ApiImplicitParam(name = "packagingBoxId", value = "包装箱ID,BoxId", paramType = "query", dataTypeClass = String.class), |
|
|
|
@ApiImplicitParam(name = "woSubstrateId", value = "基板ID(关联T_SUBSTRATE表)", paramType = "query", dataTypeClass = String.class) |
|
|
|
|
|
|
|
}) |
|
|
|
public List<WoPackagingBoxSubstrateDTO> substrateList(@ApiIgnore @RequestParam Map<String, Object> params){ |
|
|
|
return woPackagingBoxSubstrateService.substrateList(params); |
|
|
|
public Result<PageData<WoPackagingBoxSubstrateDTO>> substrateList(@RequestBody PackingInfoQueryParam param){ |
|
|
|
PageData<WoPackagingBoxSubstrateDTO> page = woPackagingBoxSubstrateService.substratePage(param); |
|
|
|
return new Result<PageData<WoPackagingBoxSubstrateDTO>>().ok(page); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("exportPackingInfo") |
|
|
|