|
|
@@ -4,7 +4,9 @@ import com.deer.wms.intercept.annotation.Authority; |
|
|
|
import com.deer.wms.intercept.annotation.User; |
|
|
|
import com.deer.wms.intercept.common.data.CurrentUser; |
|
|
|
import com.deer.wms.produce.manage.model.*; |
|
|
|
import com.deer.wms.produce.manage.service.MtAloneProcessService; |
|
|
|
import com.deer.wms.produce.manage.service.ProcessBomService; |
|
|
|
import com.deer.wms.produce.manage.service.ProductProcessBatchDetService; |
|
|
|
import com.deer.wms.produce.manage.service.ProductProcessService; |
|
|
|
import com.deer.wms.project.seed.annotation.OperateLog; |
|
|
|
import com.deer.wms.project.seed.core.result.CommonCode; |
|
|
@@ -37,7 +39,10 @@ public class ProductProcessController { |
|
|
|
private ProductProcessService productProcessService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private ProcessBomService processBomService; |
|
|
|
private MtAloneProcessService processService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private ProductProcessBatchDetService productProcessBatchDetService; |
|
|
|
|
|
|
|
/** |
|
|
|
* hy暂时没用 |
|
|
@@ -238,27 +243,32 @@ public class ProductProcessController { |
|
|
|
|
|
|
|
/** |
|
|
|
* hy正在用(打卷系统) |
|
|
|
* 根据批次加工单id获取其下的卷号和工序 |
|
|
|
* 根据批次加工单id获取其下所有的工序和明细 |
|
|
|
* @param params |
|
|
|
* @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) |
|
|
|
}) |
|
|
|
@OperateLog(description = "批次生产加工单下的工序和卷号查询", type = "查询") |
|
|
|
@GetMapping("/step/and/num/by/prodprocid") |
|
|
|
public Result stepAndNumByProdprocid(ProductProcessParams params, @ApiIgnore @User CurrentUser currentUser) { |
|
|
|
//if(currentUser==null){ |
|
|
|
// return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); |
|
|
|
//} |
|
|
|
@GetMapping("/processAndDetByProductProcess") |
|
|
|
public Result processAndDetByProductProcess(ProductProcessParams params, @ApiIgnore @User CurrentUser currentUser) { |
|
|
|
if(currentUser==null){ |
|
|
|
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); |
|
|
|
} |
|
|
|
|
|
|
|
params.setCompanyId(1); |
|
|
|
ProcessStepAndVolumeNum processStepAndVolumeNum = productProcessService.stepAndNumByProdprocid(params); |
|
|
|
return ResultGenerator.genSuccessResult(processStepAndVolumeNum); |
|
|
|
params.setCompanyId(currentUser.getCompanyId()); |
|
|
|
ProcessAndDet processAndDet = new ProcessAndDet(); |
|
|
|
//获取工序 |
|
|
|
List<MtAloneProcessVo> processVoList = processService.findProcessVoListByProductProcess(params); |
|
|
|
//获取明细 |
|
|
|
List<ProductProcessBatchDet> productProcessBatchDetList = productProcessBatchDetService.findListByProductProcess(params); |
|
|
|
processAndDet.setProcessVoList(processVoList); |
|
|
|
processAndDet.setProductProcessBatchDetList(productProcessBatchDetList); |
|
|
|
return ResultGenerator.genSuccessResult(processAndDet); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |