blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyujie
2025-07-08 7104751e2f26872d4891d01d42ee88cf19715d01 
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java


@@ -17,11 +17,13 @@


import com.example.erp.entity.userInfo.Log;


import com.example.erp.entity.userInfo.SysError;


import com.example.erp.exception.ServiceException;


import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;


import com.example.erp.mapper.mm.FinishedOperateLogMapper;


import com.example.erp.mapper.pp.*;


import com.baomidou.dynamic.datasource.annotation.DS;


import com.example.erp.mapper.sd.*;


import com.example.erp.mapper.userInfo.LogMapper;


import com.example.erp.service.mm.FinishedGoodsInventoryService;


import com.example.erp.service.sd.OrderProcessDetailService;


import com.example.erp.service.userInfo.LogService;


import com.example.erp.service.userInfo.SysErrorService;


@@ -70,6 +72,7 @@


    private final PatchLogMapper patchLogMapper;


    private final ReworkMapper reworkMapper;


    private final BasicDateMapper basicDataMapper;


    private final FinishedGoodsInventoryService finishedGoodsInventoryService;






    /*public ReportingWorkService(ReportingWorkMapper reportingWorkMapper, BasicDateProduceMapper basicDateProduceMapper, DamageDetailsMapper damageDetailsMapper, ReportingWorkDetailMapper reportingWorkDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, OrderProcessDetailService orderProcessDetailService, OrderMapper orderMapper, FlowCardMapper flowCardMapper, LogService logService, LogMapper logMapper, OrderGlassDetailMapper orderGlassDetailMapper, SysErrorService sysErrorService, OrderDetailMapper orderDetailMapper, FinishedOperateLogMapper finishedOperateLogMapper, ReportingWorkTransferMapper reportingWorkTransferMapper) {


@@ -366,9 +369,7 @@


            }




            //更新流程卡表的报工数量


            System.out.println("下工序：：："+reportingWork.getNextProcess());


            if (reportingWork.getNextProcess() == null || reportingWork.getNextProcess().isEmpty()) {


                System.out.println("测试库存数量");


                LambdaUpdateWrapper<FlowCard> flowCardLambdaUpdateWrapper =


                        new LambdaUpdateWrapper<>();


                flowCardLambdaUpdateWrapper


@@ -1202,5 +1203,12 @@




    }




      public List<BasicDataProduce> selectEquipmentByProcessSv(String process) {


             return reportingWorkMapper.SelectWorkBasicDeviceMp(process);


          }




}


      public String saveWorkStorage(Map<String, Object> object) {


              //List<Map<String, Object>> flowCard = reportingWorkMapper.getStorageData();


              //finishedGoodsInventoryService.addSelectWarehousing(object);


              return null;


          }}