发货时间限制

pang.jiabao

10 小时以前 f8193b239dac7276cb9203af51ad9b424fa5e90d

 src/main/java/com/zy/asrs/controller/PlaController.java

@@ -14,12 +14,17 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.GlobleParameter;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.mapper.ManPakOutMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.PlaExcelListener;
import com.zy.asrs.utils.SaasUtils;
import com.zy.common.CodeRes;
import com.zy.common.entity.PlaExcel;
import com.zy.common.web.BaseController;
import com.zy.system.entity.Config;
import com.zy.system.entity.OperateLog;
import com.zy.system.service.OperateLogService;
import com.zy.system.service.impl.ConfigServiceImpl;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -28,10 +33,14 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;

@RestController
@Slf4j
@@ -54,6 +63,34 @@
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;

    @Resource
    private OperateLogService operateLogService;
    @Autowired
    private ConfigServiceImpl configService;

    // 获取下拉选择框值列表
    @GetMapping(value = "/pla/dropdownValues/list")
    @ManagerAuth
    public R list() {
        List<DropdownValuesDto> list = plaService.getDropdownValues();
        Map<String, List<String>> map = new HashMap<>();

        // owner 去重并加入 map
        List<String> owners = list.stream()
                .filter(dropdownValuesDto -> dropdownValuesDto.getType().equals("owner"))
                .map(DropdownValuesDto::getValue)
                .collect(Collectors.toList());
        map.put("owner", owners);

        // workshop 去重并加入 map
        List<String> workshops = list.stream()
                .filter(dropdownValuesDto -> dropdownValuesDto.getType().equals("workshop"))
                .map(DropdownValuesDto::getValue)
                .collect(Collectors.toList());
        map.put("workshop", workshops);
        return R.ok(map);
    }


    @RequestMapping(value = "/pla/list/auth")
    @ManagerAuth
@@ -67,6 +104,11 @@
        if (!Cools.isEmpty(param.get("brand"))) {
            wrapper.eq("brand", param.get("brand"));
            param.remove("brand");
        }
        // 仓库精确匹配
        if (!Cools.isEmpty(param.get("stash"))) {
            wrapper.eq("stash", param.get("stash"));
            param.remove("stash");
        }
        // 没有选择的时候默认不显示已出库的物料
        if (Cools.isEmpty(param.get("status"))) {
@@ -98,7 +140,48 @@
    @RequestMapping(value = "/pla/update/auth")
    @ManagerAuth
    public R update(@RequestBody List<Pla> plas) {
        log.info(plas.toString());
        Date date = new Date();
        Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "pla_status"));
        String value;
        if (config != null && config.getStatus() == 1) {
            value = config.getValue();
        } else {
            value = "";
        }
        plas.forEach(pla -> {
            Pla plaSave = plaService.selectById(pla.getId());
            String status = plaSave.getStatus();
            if (status != null && !Cools.isEmpty(value) && value.indexOf(status) == -1) {
                throw new CoolException("修改" + plaSave.getBatch() + "批号权限不足，请联系管理员进行修改");
            }
            pla.setModifyTime(new Date());
            plaService.updateById(pla);

            PlaLog plaLog = new PlaLog();
            BeanUtils.copyProperties(plaSave, plaLog);
            plaLog.setId(null);
            plaLog.setCreateTime(date);
            plaLog.setModifyUser(getUser().getUsername());
            plaLogService.insert(plaLog);

            // 记录操作日志
            OperateLog operateLog = new OperateLog();
            operateLog.setAction("聚乳酸库存明细修改");
            operateLog.setUserId(getUserId());
            operateLog.setIp(request.getRemoteAddr());
            operateLog.setRequest(pla.toString());
            operateLog.setResponse(plaSave.toString());
            operateLog.setCreateTime(new Date());
            operateLogService.insert(operateLog);

        });
        return R.ok();
    }

    @RequestMapping(value = "/pla/updateByAdmin/auth")
    @ManagerAuth
    public R updateByAdmin(@RequestBody List<Pla> plas) {
        Date date = new Date();
        plas.forEach(pla -> {
            Pla plaSave = plaService.selectById(pla.getId());
            pla.setModifyTime(new Date());
@@ -107,9 +190,19 @@
            PlaLog plaLog = new PlaLog();
            BeanUtils.copyProperties(plaSave, plaLog);
            plaLog.setId(null);
            plaLog.setCreateTime(new Date());
            plaLog.setCreateTime(date);
            plaLog.setModifyUser(getUser().getUsername());
            plaLogService.insert(plaLog);

            // 记录操作日志
            OperateLog operateLog = new OperateLog();
            operateLog.setAction("聚乳酸库存明细修改");
            operateLog.setUserId(getUserId());
            operateLog.setIp(request.getRemoteAddr());
            operateLog.setRequest(pla.toString());
            operateLog.setResponse(plaSave.toString());
            operateLog.setCreateTime(new Date());
            operateLogService.insert(operateLog);

        });
        return R.ok();
@@ -144,11 +237,43 @@
        return R.ok(plaQtyService.getDeliveryDate());
    }

    @Resource
    private ManPakOutMapper manPakOutMapper;

    @RequestMapping(value = "/pla/sellout/auth")
    @ManagerAuth
    @ManagerAuth(memo = "sellout")
    @Transactional
    @Synchronized
    public R sellout(@RequestBody List<Pla> plas) {
        // 判断发货时间段内，是否超
        String pakoutTime = plas.get(0).getPakoutTime().split("\\(")[0];
        if (!Cools.isEmpty(pakoutTime)) {
            // 获取时间段内发货重量限额
            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "MAX_WEIGHT_PER_HOUR").eq("status", 1));
            if (config != null) {
                pakoutTime = pakoutTime.split("\\(")[0].trim();
                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

                // 解析
                LocalDateTime dateTime = LocalDateTime.parse(pakoutTime, formatter);

                // 当小时起点
                LocalDateTime startHour = dateTime.withMinute(0).withSecond(0);

                // 下一个小时
                LocalDateTime endHour = startHour.plusHours(1); // 自动处理跨天

                // 转回字符串
                String startStr = startHour.format(formatter); // 2026-01-28 23:00:00
                String endStr = endHour.format(formatter);     // 2026-01-29 00:00:00

                long anfme = manPakOutMapper.maxWeightPerHour(startStr, endStr);
                long weightMax = Long.parseLong(config.getValue());
                if (anfme + plas.get(0).getOrderWeight().longValue() > weightMax) {
                    throw new CoolException("超小时重量限额:" + weightMax + "，该小时发货量已有：" + anfme);
                }
            }
        }

        String orderNo = plas.get(0).getOrderNo();
        String maktx = plas.get(0).getBrand();
@@ -157,7 +282,11 @@
        OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMaktx(orderNo, maktx);

        for (Pla pla : plas) {

            // 获取最新冻结状态
            Pla pla1 = plaService.selectOne(new EntityWrapper<Pla>().setSqlSelect("stock_freeze as stockFreeze,stock_freeze_by as stockFreezeBy,stock_freeze_date as stockFreezeDate").eq("id", pla.getId()));
            pla.setStockFreeze(pla1.getStockFreeze());
            pla.setStockFreezeBy(pla1.getStockFreezeBy());
            pla.setStockFreezeDate(pla1.getStockFreezeDate());
            if (pla.getStockFreeze() == 0) {
//                throw new CoolException("库存已被冻结，请重新选择库存");
                log.info("该库存已被其他用户冻结，请重新选择;{},{}", pla.getStockFreezeBy(), getUser().getUsername());
@@ -171,9 +300,13 @@
            if (pla.getWeightAnfme() - pla.getQtyAnfme() - pla.getOrderWeight() < 0) {
                throw new CoolException("批号:" + pla.getBatch() + "，包号:" + pla.getPackageNo() + " 剩余可出库重量不足，请调整出库重量");
            }
            if (Cools.isEmpty(pla.getMassState())) {
                throw new CoolException("质量指标为上传");
            }
            pla.setQtyAnfme(pla.getQtyAnfme() + pla.getOrderWeight());
            pla.setHandlerBy(getUser().getUsername());
            pla.setStatus(GlobleParameter.PLA_STATUS_2);
            log.info("修改为待出库，地址：{},数据:{}", "/pla/sellout/auth", pla);
            pla.setModifyTime(new Date());
            pla.setPakoutTime(pla.getPakoutTime().split("\\(")[0]);
            //生成此次作业信息
@@ -230,7 +363,7 @@
            pla.setWeightAnfme(0.0);
            plaService.updateById(pla);
            SaasUtils.insertLog(1, pla.getLocNo(), pla.getBrand(), anfme, getUser().getUsername(),
                    null, pla.getBatch(), pla.getPackageNo(), pla.getOwner(), pla.getWorkshop(), null);
                    null, pla.getBatch(), pla.getPackageNo(), pla.getOwner(), pla.getWorkshop(), null,"全部出库" + anfme,pla.getMemo(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);
        });

        return R.ok();
@@ -418,6 +551,7 @@
        manPakOut.setNodeId(plaQty.getId());
        manPakOut.setCustName(plaQty.getCustomer());
        manPakOut.setCreateBy(userId);
        manPakOut.setMemo(plaQty.getMemo()); // 备注
        //预计发货时间
        manPakOut.setSpecs(plaQty.getPakoutTime());
        //manPakOut.setNodeId(plaQty.getOrderDetlId());