记录操作日志-聚乳酸库存明细修改

pang.jiabao

4 天以前 764a32583d494093d57a82f49e8ac6183335cc9a

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

@@ -20,6 +20,8 @@
import com.zy.common.CodeRes;
import com.zy.common.entity.PlaExcel;
import com.zy.common.web.BaseController;
import com.zy.system.entity.OperateLog;
import com.zy.system.service.OperateLogService;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -28,10 +30,12 @@
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.util.*;
import java.util.stream.Collectors;

@RestController
@Slf4j
@@ -54,6 +58,32 @@
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;

    @Resource
    private OperateLogService operateLogService;

    // 获取下拉选择框值列表
    @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 +97,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"))) {
@@ -88,7 +123,7 @@
    @RequestMapping(value = "/pla/add/auth")
    @ManagerAuth
    public R add(@RequestBody List<Pla> plas) {
        System.out.println(plas.toString());
        log.info(plas.toString());
        plas.forEach(pla -> {
            plaService.insert(pla);
        });
@@ -98,7 +133,7 @@
    @RequestMapping(value = "/pla/update/auth")
    @ManagerAuth
    public R update(@RequestBody List<Pla> plas) {
        System.out.println(plas.toString());
        Date date = new Date();
        plas.forEach(pla -> {
            Pla plaSave = plaService.selectById(pla.getId());
            pla.setModifyTime(new Date());
@@ -107,9 +142,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();
@@ -118,7 +163,7 @@
    @RequestMapping(value = "/pla/delete/auth")
    @ManagerAuth
    public R delete(@RequestBody List<Pla> plas) {
        System.out.println(plas.toString());
        log.info(plas.toString());
        plas.forEach(pla -> {
            if (!pla.getStatus().equals(GlobleParameter.PLA_STATUS_00) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_0) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_1)) {
                throw new CoolException("已入库的数据无法被删除");
@@ -145,7 +190,7 @@
    }

    @RequestMapping(value = "/pla/sellout/auth")
    @ManagerAuth
    @ManagerAuth(memo = "sellout")
    @Transactional
    @Synchronized
    public R sellout(@RequestBody List<Pla> plas) {
@@ -157,10 +202,14 @@
        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("库存已被冻结，请重新选择库存");
                System.out.println(pla.getStockFreezeBy() + "," + getUser().getUsername());
                log.info("该库存已被其他用户冻结，请重新选择;{},{}", pla.getStockFreezeBy(), getUser().getUsername());
                if (!Cools.eq(pla.getStockFreezeBy(), getUser().getUsername())) {
                    throw new CoolException("该库存已被其他用户冻结，请重新选择");
                }
@@ -171,9 +220,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]);
            //生成此次作业信息