单据名称增加单据来源

qushaowei

2023-11-06 d40c3ccad0e5264fefd33264254564dead8c80df

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java

@@ -37,6 +37,7 @@
import lombok.extern.slf4j.Slf4j;


import org.jeecg.modules.eam.vo.SysFileNameVo;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -106,6 +107,9 @@

    @Autowired
    private IMaintenanceStoveExemptService maintenanceStoveExemptService;

    @Autowired
    private ISysFileNameService sysFileNameService;


    /**
@@ -214,7 +218,7 @@
     */
    @GetMapping("getDailyMaintenanceOrder3List")
    public Result<?> getDailyMaintenanceOrder3List(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
        IPage<Map<String, Object>> dailyMaintenanceOrderList = dailyMaintenanceOrderService.getDailyMaintenanceOrderList(pageNo, pageSize, params);
        IPage<Map<String, Object>> dailyMaintenanceOrderList = dailyMaintenanceOrderService.getDailyMaintenanceOrder3List(pageNo, pageSize, params);
        List<Map<String, Object>> records = dailyMaintenanceOrderList.getRecords();
        for (Map<String, Object> record : records) {
            String id = (String) record.get("id");
@@ -708,8 +712,10 @@


    void createMaintenanceStoveExempt(DailyMaintenanceOrder dailyMaintenanceOrder){
        List<SysFileNameVo> sysFileName = sysFileNameService.getSysFileName("20");
        MaintenanceStoveExempt maintenanceStoveExempt = new MaintenanceStoveExempt();
        maintenanceStoveExempt.setMaintenanceOrderId(dailyMaintenanceOrder.getId());
        maintenanceStoveExempt.setReceipts(sysFileName.get(0).getReceipts());
        maintenanceStoveExemptService.save(maintenanceStoveExempt);
    }

@@ -733,9 +739,11 @@
        String userId = sysUser.getId();

        String orderId = dailyMaintenanceOrder.getId();
        String maintenanceOrderUda3 = dailyMaintenanceOrder.getMaintenanceOrderUda3();
        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(orderId);
        String equipmentId = maintenanceOrder.getEquipmentId();
        String confirmStatus = maintenanceOrder.getConfirmStatus();
        String orderUda3 = maintenanceOrder.getMaintenanceOrderUda3();

        List<FinishTransferOrder> finishTransferOrders = finishTransferOrderService.lambdaQuery()
                .eq(FinishTransferOrder::getMaintenanceOrderId, orderId)
@@ -746,12 +754,18 @@
               finishTransferOrder.setRepairDirectorUser(userId);
               finishTransferOrderService.updateById(finishTransferOrder);

                if(StringUtils.isBlank(orderUda3)){
                    maintenanceOrder.setMaintenanceOrderUda3(maintenanceOrderUda3);
                }
               maintenanceOrder.setConfirmStatus("1");
               dailyMaintenanceOrderService.updateById(maintenanceOrder);
           }else{
               finishTransferOrder.setEquipmentInspectorUser(userId);
               finishTransferOrderService.updateById(finishTransferOrder);

               if(StringUtils.isBlank(orderUda3)){
                   maintenanceOrder.setMaintenanceOrderUda3(maintenanceOrderUda3);
               }
               maintenanceOrder.setConfirmStatus("2");
               maintenanceOrder.setStatus("8");
               dailyMaintenanceOrderService.updateById(maintenanceOrder);
@@ -764,6 +778,7 @@
    @RequestMapping(value = "/editTechnologyStatus", method = {RequestMethod.PUT,RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> editTechnologyStatus(@RequestBody Equipment equipment) {
        equipment.setTechnologyStatusVerificationType("1");
        equipmentService.updateById(equipment);

        DailyMaintenanceOrder dailyMaintenanceOrder = dailyMaintenanceOrderService.getById(equipment.getMaintenanceOrderId());