Merge remote-tracking branch 'origin/dev' into dev

lxp

2025-03-14 8246ec51e9cf0fdb37a76bc62cac4ac2b3ffc893

 cnas-require/src/main/java/com/ruoyi/require/service/impl/PkMasterServiceImpl.java

@@ -1,15 +1,19 @@
package com.ruoyi.require.service.impl;
package com.ruoyi.requier.service.impl;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;

import cn.hutool.core.util.ObjectUtil;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.vo.StandardProductVO;
import com.ruoyi.common.core.domain.entity.User;
@@ -24,12 +28,13 @@
import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHours;
import com.ruoyi.performance.pojo.PerformanceShift;
import com.ruoyi.performance.pojo.ShiftTime;
import com.ruoyi.require.mapper.PkMasterMapper;
import com.ruoyi.require.mapper.PkSlaveMapper;
import com.ruoyi.require.pojo.PkMaster;
import com.ruoyi.require.pojo.PkSlave;
import com.ruoyi.require.service.InsOrderPlanService;
import com.ruoyi.require.service.PkMasterService;
import com.ruoyi.requier.mapper.PkMasterMapper;
import com.ruoyi.requier.mapper.PkSlaveMapper;
import com.ruoyi.requier.pojo.PkMaster;
import com.ruoyi.requier.pojo.PkSlave;
import com.ruoyi.requier.service.InsOrderPlanService;
import com.ruoyi.requier.service.PkMasterService;
import com.ruoyi.requier.service.impl.InsOrderPlanServiceImpl;
import com.ruoyi.system.mapper.UserMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.logging.log4j.util.Strings;