#order.setmemo(0)

zjj

4 天以前 fc9ebcd99b4cea492a0a04a6df8bf115c0234d27

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

@@ -19,6 +19,7 @@
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;
@@ -84,7 +85,7 @@
    }

    @Override
    public R stockPakin(PakinParam param, Long userId, Long hostId) {
    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());
@@ -109,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());
@@ -122,13 +123,14 @@
                manLocDetl.setCreateBy(userId);
                manLocDetl.setStatus(1);
                manLocDetl.setPayment(1);
                SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme());
                SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername());
                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>()
@@ -144,7 +146,7 @@

    @Transactional
    @Override
    public R initPakout(List<InitPakoutParam> params, Long userId, Long hostId) {
    public R initPakout(List<InitPakoutParam> params, Long userId, Long hostId,User user) {
        if (!Cools.isEmpty(params)) {
            Date now = new Date();
            for (InitPakoutParam param : params) {
@@ -162,7 +164,7 @@
                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());
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername());
                    manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
                            .eq("loc_no",node.getUuid())
                            .eq("matnr",param.getMatnr()));
@@ -172,7 +174,7 @@
                    manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
                            .eq("loc_no",node.getUuid())
                            .eq("matnr",param.getMatnr()));
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount());
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername());
                }
            }
        }
@@ -181,9 +183,9 @@

    @Transactional
    @Override
    public void locMove(String sourceLocNo, String targetLocNo, Long userId) {
    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));
@@ -196,20 +198,22 @@
                    .eq("loc_no", targetNode.getUuid())
                    .eq("matnr", source.getMatnr()));
            if (check == null) {
                manLocDetlService.deleteById(source);
                manLocDetlService.delete(new EntityWrapper<ManLocDetl>().eq("loc_no", source.getLocNo())
                        .eq("matnr", source.getMatnr()));
                source.setLocNo(targetNode.getUuid());
                source.setNodeId(targetNode.getId());

                SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme());
                SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername());
                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("目标库位有物");
            }

        }