@@ -107,8 +107,7 @@ public class ProductProcessController {
@ApiOperation(value = "批次生产加工单分页查询", notes = "批次生产加工单分页查询")
@ApiImplicitParams({
@ApiImplicitParam(name = "createDate", value = "创建时间", paramType = "query", dataType = "String", required = false),
@ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String", required = false),
@ApiImplicitParam(name = "companyId", value = "公司id", paramType = "query", dataType = "int", required = false)
@ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String", required = false)
})
@OperateLog(description = "批次生产加工单分页查询", type = "查询")
@@ -157,8 +156,7 @@ public class ProductProcessController {
*/
@ApiOperation(value = "批次生产加工单详情查询", notes = "批次生产加工单详情查询")
@ApiImplicitParams({
@ApiImplicitParam(name = "productProcessId", value = "批次生产加工单id", paramType = "query", dataType = "int", required = true),
@ApiImplicitParam(name = "companyId", value = "公司id", paramType = "query", dataType = "int", required = false)
@ApiImplicitParam(name = "productProcessId", value = "批次生产加工单id", paramType = "query", dataType = "int", required = true)
})
@OperateLog(description = "批次生产加工单详情查询", type = "查询")
@GetMapping("/query/product/process/detail")
@@ -182,8 +180,7 @@ public class ProductProcessController {
*/
@ApiOperation(value = "初始化批次生产加工单信息", notes = "初始化批次生产加工单信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "productBomId", value = "产品bom的id", paramType = "query", dataType = "int", required = true),
@ApiImplicitParam(name = "companyId", value = "公司id", paramType = "query", dataType = "int", required = false)
@ApiImplicitParam(name = "productBomId", value = "产品bom的id", paramType = "query", dataType = "int", required = true)
})
@OperateLog(description = "初始化批次生产加工单信息", type = "查询")
@@ -248,12 +245,11 @@ public class ProductProcessController {
* @param currentUser
* @return
*/
@ApiOperation(value = "批次生产加工单下的工序和明细查询", notes = "批次生产加工单下的工序和卷号 查询")
@ApiOperation(value = "批次生产加工单下的工序和批次 明细查询", notes = "批次生产加工单下的工序和批次明细 查询")
@ApiImplicitParams({
@ApiImplicitParam(name = "productProcessId", value = "批次生产加工单id", paramType = "query", dataType = "int", required = true),
@ApiImplicitParam(name = "companyId", value = "公司id", paramType = "query", dataType = "int", required = false)
@ApiImplicitParam(name = "productProcessId", value = "批次生产加工单id", paramType = "query", dataType = "int", required = true)
})
@OperateLog(description = "批次生产加工单下的工序和卷号 查询", type = "查询")
@OperateLog(description = "批次生产加工单下的工序和批次明细 查询", type = "查询")
@GetMapping("/processAndDetByProductProcess")
public Result processAndDetByProductProcess(ProductProcessParams params, @ApiIgnore @User CurrentUser currentUser) {
if(currentUser==null){
@@ -264,11 +260,54 @@ public class ProductProcessController {
ProcessAndDet processAndDet = new ProcessAndDet();
//获取工序
List<MtAloneProcessVo> processVoList = processService.findProcessVoListByProductProcess(params);
//获取明细
//获取批次 明细
List<ProductProcessBatchDet> productProcessBatchDetList = productProcessBatchDetService.findListByProductProcess(params);
processAndDet.setProcessVoList(processVoList);
processAndDet.setProductProcessBatchDetList(productProcessBatchDetList);
processAndDet.setProductProcessId(params.getProductProcessId());//批次加工单id赋值
processAndDet.setProcessVoList(processVoList);//所有工序赋值
processAndDet.setProductProcessBatchDetList(productProcessBatchDetList);//所有批次明细赋值
return ResultGenerator.genSuccessResult(processAndDet);
}
/**
* hy正在用(打卷系统)
* 根据批次加工单id、工序id、明细id,获取批次加工单、工序、明细信息,用于打卷页面信息展示
* @param condition
* @param currentUser
* @return
*/
@ApiOperation(value = "根据批次加工单id、工序id、批次明细id,获取批次加工单、工序、批次明细信息", notes = "根据批次加工单id、工序id、批次明细id,获取批次加工单、工序、批次明细信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "productProcessId", value = "批次生产加工单id", paramType = "query", dataType = "int", required = true),
@ApiImplicitParam(name = "processId", value = "工序id", paramType = "query", dataType = "int", required = true),
@ApiImplicitParam(name = "batchDetId", value = "批次明细id", paramType = "query", dataType = "int", required = true)
})
@OperateLog(description = "根据批次加工单id、工序id、批次明细id,获取批次加工单、工序、批次明细信息", type = "查询")
@GetMapping("/productProcessBatchDetInfoByProductProcess")
public Result productProcessBatchDetInfoByProductProcess(ProductProcessBatchDetCondition condition, @ApiIgnore @User CurrentUser currentUser) {
if(currentUser==null){
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
}
condition.setCompanyId(currentUser.getCompanyId());
ProductProcessBatchDetInfo productProcessBatchDetInfo = new ProductProcessBatchDetInfo();
//获取批次加工单
ProductProcessParams productProcessParams = new ProductProcessParams();
BeanUtils.copyProperties(condition, productProcessParams);
ProductProcessVo productProcessVo = productProcessService.findProductProcessById(productProcessParams);
productProcessBatchDetInfo.setProductProcessVo(productProcessVo);
//获取工序
MtAloneProcessParams processParams = new MtAloneProcessParams();
BeanUtils.copyProperties(condition, processParams);
MtAloneProcessVo processVo = processService.findProcessById(processParams);
productProcessBatchDetInfo.setProcessVo(processVo);
//获取批次明细
ProductProcessBatchDetParams batchDetParams = new ProductProcessBatchDetParams();
BeanUtils.copyProperties(condition, batchDetParams);
ProductProcessBatchDet batchDet = productProcessBatchDetService.findBatchDetById(batchDetParams);
productProcessBatchDetInfo.setProductProcessBatchDet(batchDet);
return ResultGenerator.genSuccessResult(productProcessBatchDetInfo);
}
}