Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/product/controller/BizLotController.java

@@ -77,12 +77,12 @@ public class BizLotController extends BaseController {
     public AjaxResult getProcessListByLot(BizLot bizLot) throws NoSuchFieldException, IllegalAccessException {
             //该批是否废品回用
             if(bizLot.getIsWasteRecycling() == 1 || bizLot.getIsAmend() == 1 ) {
-                QueryWrapper<BizLotTechnologicalProcess> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("lot_id",bizLot.getId());
-                queryWrapper.eq("is_stop",0);
-                BizLotTechnologicalProcess wasteRecycling = bizLotTechnologicalProcessService.getOne(queryWrapper);
+//                QueryWrapper<BizLotTechnologicalProcess> queryWrapper = new QueryWrapper<>();
+//                queryWrapper.eq("lot_id",bizLot.getId());
+//                queryWrapper.eq("is_stop",0);
+//                BizLotTechnologicalProcess wasteRecycling = bizLotTechnologicalProcessService.getOne(queryWrapper);
                 QueryWrapper<BizLotTechnologicalProcessDetail> wrapper = new QueryWrapper<>();
-                wrapper.eq("lot_technological_process_id",wasteRecycling.getId());
+                wrapper.eq("lot_technological_process_id",bizLot.getTechnologicalProcessId());
                 //去掉备料的序
                 wrapper.ne("process_id",0);
                 wrapper.ne("process_id",1);