|
@@ -116,6 +116,7 @@ public class BizLotController extends BaseController {
|
|
|
// BizLotTechnologicalProcess wasteRecycling = bizLotTechnologicalProcessService.getOne(queryWrapper);
|
|
|
QueryWrapper<BizLotTechnologicalProcessDetail> wrapper = new QueryWrapper<>();
|
|
|
wrapper.eq("lot_technological_process_id",bizLot.getTechnologicalProcessId());
|
|
|
+ wrapper.eq("tenant_id",bizLot.getTenantId());
|
|
|
//去掉备料的序
|
|
|
wrapper.ne("process_id",0);
|
|
|
wrapper.ne("process_id",1);
|
|
@@ -129,6 +130,7 @@ public class BizLotController extends BaseController {
|
|
|
wrapper.eq("technological_process_id",bizLot.getTechnologicalProcessId());
|
|
|
wrapper.ne("process_id",0);
|
|
|
wrapper.ne("process_id",1);
|
|
|
+ wrapper.eq("tenant_id",bizLot.getTenantId());
|
|
|
wrapper.ne("tenant_id", 9);
|
|
|
wrapper.orderByAsc("process_step_number");
|
|
|
return success(bizTechnologicalProcessDetailService.list(wrapper));
|