inspect-server/src/main/java/com/ruoyi/inspect/aspect/PushIfsPartPropsRecordAspect.java

@@ -91,10 +91,10 @@
                            throw new RuntimeException("库存物料批次属性更新失败："+result.getMessage());
                        }
                        log.info("KJNS域外购订单免检同步库存物料批次属性到IFS->{}", result);
                        oneByContract.setId(null);
                        oneByContract.setIfsInventoryId(ifsInventoryId);
                        ifsPartPropsRecordService.save(oneByContract);
                    }
                    oneByContract.setId(null);
                    oneByContract.setIfsInventoryId(ifsInventoryId);
                    ifsPartPropsRecordService.save(oneByContract);
                }
            }
        }

 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java

@@ -33,6 +33,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

@RestController
@AllArgsConstructor
@@ -132,44 +133,31 @@
    }


    @ApiOperation(value = "撤销")
    @ApiOperation(value = "撤销未审核订单")
    @PostMapping("/updateStatus")
    public Result<?> updateStatus(@RequestBody Map<String, Object> param) {
        Integer id = (Integer) param.get("id");
        insOrderService.updateStatus(id);
    public Result<?> updateStatus(@RequestBody ProductOrderRevokeDTO revokeDTO) {
        insOrderService.updateStatus(revokeDTO.getId());
        return Result.success();
    }

    //待检的撤销的查询待检项目
    @GetMapping("/selectNoProducts")
    public Result<?> selectNoProducts(Page page, InsProduct insProduct, Integer orderId, String ids) {
        return Result.success(insProductService.selectNoProducts(page, insProduct, orderId, ids));
    public Result<?> selectNoProducts(Page page, ProductOrderRevokeDTO revokeDTO) {
        return Result.success(insProductService.selectNoProducts(page, revokeDTO.getOrderId(), revokeDTO.getRevocationInsProductIds()));
    }


    @ApiOperation(value = "待检的撤销")
    @PostMapping("/updateInspected")
    public Result<?> updateInspected(@RequestBody Map<String, Object> param) {
        Integer orderId = (Integer) param.get("orderId");
        String ids = (String) param.get("ids");
        Integer typeSource = (Integer) param.get("typeSource");
        Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
        if (Objects.nonNull(typeSource) && typeSource == 1) {
            ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
                    .set(IfsInventoryQuantity::getState, 0)
                    .eq(IfsInventoryQuantity::getId, ifsInventoryId));
            insOrderService.update(null, new LambdaUpdateWrapper<InsOrder>().set(InsOrder::getState, -1).eq(InsOrder::getId, orderId)); // æ’¤é”€
        }
        insProductService.updateInspected(orderId, ids);
    public Result<?> updateInspected(@RequestBody ProductOrderRevokeDTO revokeDTO) {
        insProductService.updateInspected(revokeDTO.getOrderId(), revokeDTO.getIds().stream().map(String::valueOf).collect(Collectors.joining(",")));
        return Result.success();
    }

    @ApiOperation(value = "审核待检撤销")
    @PostMapping("/checkUpdate")
    public Result<?> checkUpdate(@RequestBody Map<String, Object> param) {
        Integer orderId = (Integer) param.get("orderId");
        Integer state = (Integer) param.get("state");
        insProductService.checkUpdate(orderId, state);
    public Result<?> checkUpdate(@RequestBody ProductOrderRevokeDTO revokeDTO) {
        insProductService.checkUpdate(revokeDTO.getOrderId(), revokeDTO.getState());
        return Result.success();
    }


 inspect-server/src/main/java/com/ruoyi/inspect/dto/ProductOrderRevokeDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
package com.ruoyi.inspect.dto;

import lombok.Data;

import java.util.List;

/**
 * æˆå“ä¸‹å•ï¼šæ‰‹åŠ¨ä¸‹å•æ’¤é”€dto
 */
@Data
public class ProductOrderRevokeDTO {

    private Integer id;

    /**
     * æ’¤é”€çš„检验项id列表
     */
    private List<Integer> ids;

    /**
     * è®¢å•id
     */
    private Integer orderId;

    /**
     * è®¢å•çŠ¶æ€
     */
    private Integer state;

    /**
     * æ’¤é”€æ£€éªŒé¡¹id字符串
     */
    private String revocationInsProductIds;

}

 inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java

@@ -24,7 +24,7 @@

    boolean write(InsOrder insOrder);

    IPage<InsProduct> selectNoProducts(Page page, InsProduct insProduct, Integer orderId, String ids);
    IPage<InsProduct> selectNoProducts(Page page, Integer orderId, String ids);

    void checkUpdate(Integer orderId,Integer state);


 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/IfsPartPropsRecordServiceImpl.java

@@ -20,6 +20,7 @@
import com.ruoyi.inspect.pojo.IfsSplitOrderRecord;
import com.ruoyi.inspect.service.IfsPartPropsRecordService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -133,8 +134,8 @@
                IfsPartPropsRecord ifsPartPropsRecord = new IfsPartPropsRecord();
                ifsPartPropsRecord.setIfsInventoryId(ifsInventoryQuantity.getId());//ifs订单id
                ifsPartPropsRecord.setDrumNo(parseObject.get("ATTR1").toString());//载具编号
                BigDecimal startMeterMark = new BigDecimal(parseObject.get("ATTR2").toString());
                BigDecimal endMeterMark = new BigDecimal(parseObject.get("ATTR3").toString());
                BigDecimal startMeterMark = ObjectUtils.isNotEmpty(parseObject.get("ATTR2"))?new BigDecimal(parseObject.get("ATTR2").toString()):BigDecimal.ZERO;
                BigDecimal endMeterMark = ObjectUtils.isNotEmpty(parseObject.get("ATTR3"))?new BigDecimal(parseObject.get("ATTR3").toString()):BigDecimal.ZERO;
                ifsPartPropsRecord.setStartMeterMark(startMeterMark);//起始米标
                ifsPartPropsRecord.setEndMeterMark(endMeterMark);//截止米标
                ifsPartPropsRecord.setOuterColor(parseObject.get("ATTR4").toString());//外护颜色

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java

@@ -61,15 +61,14 @@

    //查询待检项目
    @Override
    public IPage<InsProduct> selectNoProducts(Page page, InsProduct insProduct, Integer orderId, String ids) {
    public IPage<InsProduct> selectNoProducts(Page page, Integer orderId, String ids) {
        List<Integer> noIds = null;
        if (StringUtils.isNotBlank(ids)) {
            noIds = Arrays.asList(ids.split(",")).stream()
            noIds = Arrays.stream(ids.split(","))
                    .map(Integer::parseInt)
                    .collect(Collectors.toList());
        }
        IPage<InsProduct> insProductIPage = baseMapper.selectNoProducts(page, orderId, noIds);
        return insProductIPage;
        return baseMapper.selectNoProducts(page, orderId, noIds);
    }

    //审核待检撤销

 performance-server/src/main/java/com/ruoyi/performance/dto/StaffAttendanceDTO.java

@@ -13,6 +13,13 @@
@Data
public class StaffAttendanceDTO extends StaffAttendanceTrackingRecord {


    /**
     * å¯¼å‡ºæ—¥æœŸ
     */
    @ApiModelProperty("导出日期")
    private String reportDate;

    /**
     * å¼€å§‹æ—¶é—´
     */

 performance-server/src/main/java/com/ruoyi/performance/service/impl/StaffAttendanceTrackingRecordServiceImpl.java

@@ -50,10 +50,7 @@
import java.math.RoundingMode;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
@@ -412,10 +409,37 @@
        return this.saveOrUpdateBatch(records);
    }

    /**
     * æ ¹æ®å¯¼å‡ºæ—¥æœŸæ ¼å¼åŒ–导出时间范围
     * @param staffAttendanceDTO
     */
    private static void formatExportDateRange(StaffAttendanceDTO staffAttendanceDTO){
        if(StringUtils.isNoneBlank(staffAttendanceDTO.getReportDate())){
            LocalTime startTime = LocalTime.of(0,0,0);
            LocalTime endTime = LocalTime.of(23,59,59);
            YearMonth yearMonth;
            if(StringUtils.equals(staffAttendanceDTO.getAttendanceReportType(),CalendarType.MONTH.name())){
                yearMonth = YearMonth.parse(staffAttendanceDTO.getReportDate(),DateTimeFormatter.ofPattern("yyyy-MM"));
                LocalDateTime startDateTime = LocalDateTime.of(yearMonth.minusMonths(1L).atDay(26),startTime);
                LocalDateTime endDateTime = LocalDateTime.of(yearMonth.atDay(25),endTime);
                staffAttendanceDTO.setStartDate(startDateTime);
                staffAttendanceDTO.setEndDate(endDateTime);
            }else if(StringUtils.equals(staffAttendanceDTO.getAttendanceReportType(),CalendarType.YEAR.name())){
                Year year = Year.parse(staffAttendanceDTO.getReportDate(),DateTimeFormatter.ofPattern("yyyy"));
                yearMonth = year.atMonth(1);
                LocalDateTime startDateTime = LocalDateTime.of(yearMonth.minusMonths(1L).atDay(26),startTime);
                LocalDateTime endDateTime = LocalDateTime.of(yearMonth.withMonth(12).atDay(25),endTime);
                staffAttendanceDTO.setStartDate(startDateTime);
                staffAttendanceDTO.setEndDate(endDateTime);
            }
        }
    }

    @Override
    public void exportStaffAttendanceRecords(HttpServletResponse response, StaffAttendanceDTO staffAttendanceDTO) {
        response.reset();
        try{
            formatExportDateRange(staffAttendanceDTO);
            //查询人员架构
            List<User> userList = userMapper.selectUserListByPerformance(false);
            List<Integer> userIdList = userList.stream().map(User::getId).collect(Collectors.toList());
@@ -423,6 +447,7 @@
            //批注信息坐标信息
            List<StaffAttendanceAnnotationTextExcelData> annotationTextList = new ArrayList<>();
            // æŸ¥è¯¢ç­æ¬¡

            List<PerformanceShiftMapDto> performanceShifts = performanceShiftMapper.selectListByWorkTime(
                    staffAttendanceDTO.getStartDate(), staffAttendanceDTO.getEndDate(), staffAttendanceDTO.getKeyword());
            //获取考勤数据

 ruoyi-common/src/main/java/com/ruoyi/common/utils/api/IfsApiUtils.java

@@ -120,7 +120,7 @@
     * @return
     */
    public Result queryPartLotAttr(String contract,String inAttr) {
        return getResult(contract,"QUERY_PART_LOT_ATTR_STD", inAttr, "GET", "库存物料批次属性查询接口-->");
        return getResult(contract,"QUERY_PART_LOT_ATTR_STD", inAttr, "POST", "库存物料批次属性查询接口-->");
    }

    /**