完善出入库日志记录

pang.jiabao

2024-02-28 a8ab542c3f3bbb304f6fd7e66897433df65a2b3e

 src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java

@@ -7,24 +7,18 @@
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Node;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.InitPakoutParam;
import com.zy.asrs.entity.param.MatnrDto;
import com.zy.asrs.entity.param.PakinParam;
import com.zy.asrs.entity.result.Pakin;
import com.zy.asrs.mapper.NodeMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.SaasUtils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.beans.Transient;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -43,6 +37,12 @@
    private OrderDetlService orderDetlService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private LocRuleService locRuleService;
    @Autowired
    private LocMastService locMastService;


    @Override
    public Node getTop() {
        Node top = this.selectOne(new EntityWrapper<Node>().eq("type", 0).eq("level", 0));
@@ -85,7 +85,7 @@
    }

    @Override
    public R stockPakin(PakinParam param, Long userId, Long hostId , User user) {
    public R stockPakin(PakinParam param, Long userId, Long hostId, User user) {
        Node node = nodeService.selectByUuid(param.getNodeId(), hostId);
        if (node == null) {
            node = nodeService.selectById(param.getNodeId());
@@ -110,7 +110,7 @@
                ManLocDetl manLocDetl = new ManLocDetl();
                manLocDetl.setLocNo(node.getUuid());
                manLocDetl.setNodeId(node.getId());
                manLocDetl.setZpallet(mat.getBarcode());
                manLocDetl.setZpallet(node.getUuid());
                manLocDetl.setAnfme(dto.getCount());
                manLocDetl.setMatnr(mat.getMatnr());
                manLocDetl.setMaktx(mat.getMaktx());
@@ -123,13 +123,15 @@
                manLocDetl.setCreateBy(userId);
                manLocDetl.setStatus(1);
                manLocDetl.setPayment(1);
                SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername());
                SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername(),
                        null,null,null,null,null);
                manLocDetlService.insert(manLocDetl);
            }else {
                check.setAnfme(dto.getCount() + check.getAnfme());
                manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
                        .eq("loc_no", node.getUuid())
                        .eq("matnr", dto.getMatnr()));
//                check.setAnfme(dto.getCount() + check.getAnfme());
//                manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
//                        .eq("loc_no", node.getUuid())
//                        .eq("matnr", dto.getMatnr()));
                return R.error("库位存在物料，请勿重复入库");
            }
            if (!Cools.isEmpty(dto.getOrderNo())) {
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
@@ -145,7 +147,7 @@

    @Transactional
    @Override
    public R initPakout(List<InitPakoutParam> params, Long userId, Long hostId, User user) {
    public R initPakout(List<InitPakoutParam> params, Long userId, Long hostId,User user) {
        if (!Cools.isEmpty(params)) {
            Date now = new Date();
            for (InitPakoutParam param : params) {
@@ -163,7 +165,8 @@
                if (manLocDetl.getAnfme() - param.getCount() < 0) {
                    return R.error("物料:"+ param.getMatnr() + " 在库位中数量不足");
                } else if (manLocDetl.getAnfme() - param.getCount() == 0) {
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername());
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername(),
                            null,null,null,null,null);
                    manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
                            .eq("loc_no",node.getUuid())
                            .eq("matnr",param.getMatnr()));
@@ -173,7 +176,8 @@
                    manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
                            .eq("loc_no",node.getUuid())
                            .eq("matnr",param.getMatnr()));
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername());
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername(),
                            null,null,null,null,null);
                }
            }
        }
@@ -182,9 +186,9 @@

    @Transactional
    @Override
    public void locMove(String sourceLocNo, String targetLocNo, Long userId, User user) {
    public void locMove(String sourceLocNo, String targetLocNo, Long userId,User user) {
        List<ManLocDetl> sourceManDetl = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>()
                .like("loc_no", sourceLocNo));
                .eq("loc_no", sourceLocNo));
        for (ManLocDetl source : sourceManDetl) {
            Node targetNode = nodeService.selectOne(new EntityWrapper<Node>()
                    .eq("uuid", targetLocNo));
@@ -195,22 +199,26 @@
            }
            ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
                    .eq("loc_no", targetNode.getUuid())
                    .eq("matnr", source.getMatnr()));
                    .eq("matnr", source.getMatnr())
                    .eq("batch",source.getBatch()));
            if (check == null) {
                manLocDetlService.deleteById(source);
                manLocDetlService.delete(new EntityWrapper<ManLocDetl>().eq("loc_no", source.getLocNo())
                        .eq("matnr", source.getMatnr()).eq("batch",source.getBatch()));
                source.setLocNo(targetNode.getUuid());
                source.setNodeId(targetNode.getId());

                SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername());
                SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername(),
                        null,null,null,null,null);
                manLocDetlService.insert(source);
            }else {
                check.setAnfme(check.getAnfme() + source.getAnfme());
                manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
                        .eq("loc_no", targetNode.getUuid())
                        .eq("matnr", check.getMatnr()));
                manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
                        .eq("loc_no", sourceNode.getUuid())
                        .eq("matnr", source.getMatnr()));
//                check.setAnfme(check.getAnfme() + source.getAnfme());
//                manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
//                        .eq("loc_no", targetNode.getUuid())
//                        .eq("matnr", check.getMatnr()));
//                manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
//                        .eq("loc_no", sourceNode.getUuid())
//                        .eq("matnr", source.getMatnr()));
                throw new RuntimeException("目标库位有物");
            }

        }
@@ -224,4 +232,27 @@
        page.setTotal(baseMapper.listByPageCount(page.getCondition()));
        return page;
    }

    @Override
    public List<String> getRemmendLoc(String matnr) {
        LocRule locRule = locRuleService.selectOne(new EntityWrapper<LocRule>().eq("matnr", matnr));
        if (locRule == null){
            return null;
        }
        List<String> list = this.baseMapper.getRommendLoc(locRule.getRowBeg(),locRule.getRowEnd(),locRule.getBayBeg(),locRule.getBayEnd(),locRule.getLevBeg(),locRule.getLevEnd());
        //删除推荐库位中被冻结的库位
        list.stream().findFirst().map(e ->{
            LocMast locMast = locMastService.selectLocStatus(e);
            if (locMast.getLocSts().equals("X")){
                list.remove(e);
            }
            return e;
        });
        return list;
    }

    @Override
    public int updateStockFreeze(String name, Integer status) {
        return this.baseMapper.updateStockFreeze(name, status);
    }
}