#

18516761980

2023-03-05 ea10beebc120791a0d13bf72dc0f721014b7bfe8

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

@@ -6,25 +6,21 @@
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import com.zy.asrs.entity.param.PackParam;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.ListUtils;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;

/**
 * Created by vincent on 2022/4/9
@@ -51,6 +47,8 @@
    private TagService tagService;
    @Autowired
    private TagMapper tagMapper;
    @Autowired
    private ApiLogService apiLogService;

    @Override
    @Transactional
@@ -337,7 +335,7 @@
        Date now = new Date();
        pack = new Pack(
                param.getBarcode(),    // 条码[非空]
                analyse.getMatnr(),    // 商品编号
                analyse.getMatnr(),    // 物料号
                analyse.getBarcode(),    // 序列码
                1L,    // 订单状态
                1,    // 状态
@@ -433,9 +431,58 @@
            if (!matService.insert(mat)) {
                throw new CoolException("服务器内部错误，请联系管理员");
            } else {
                log.info("打包上线添加新物料[商品编号：{}]", mat.getMatnr());
                log.info("打包上线添加新物料[物料号：{}]", mat.getMatnr());
            }
        }
    }
    @Override
    @Transactional
    public MatSyncParam syncMat(MatSyncParam param) {
        if (Cools.isEmpty(param.getMats()) || param.getMats().size() <=0 ) {
            throw new CoolException("商品数据为空");
        }
        MatSyncParam matSyncParam = new MatSyncParam();
        ArrayList<MatSyncParam.Mats> matParams = new ArrayList<>();
        Tag tag = tagService.selectByName("全部", 1);
        for (MatSyncParam.Mats matParam : param.getMats()){
            Date date = new Date();
            Mat mat = matService.selectByMatnr(matParam.getMatnr());
            if (Cools.isEmpty(mat)) {
                Mat matNew = new Mat();
                matNew.setTagId(tag.getId());
                matNew.setMatnr(matParam.getMatnr());//物料编码
                matNew.setMaktx(matParam.getMaktx());//物料名称
                matNew.setSpecs(matParam.getSpecs());//规格
                matNew.setModel(matParam.getModel());//型号
                matNew.setColor(matParam.getColor());//颜色
                matNew.setUnit(matParam.getUnit());//单位
                matNew.setMemo(matParam.getMemo());//备注
                matNew.setCreateBy(9999L);//9999表示erp下发
                matNew.setCreateTime(date);
                matNew.setUpdateBy(9999L);//9999表示erp下发
                matNew.setUpdateTime(date);
                if (matService.insert(matNew)) {
                    callApiLogSave(matParam, "/open/asrs/mat/v1", "接收ERP下发商品信息成功！添加商品信息成功！", true);
                    matParam.setType(true);
                } else {
                    callApiLogSave(matParam, "/open/asrs/mat/v1", "添加ERP下发商品信息失败！！！状态异常！！！", false);
                    matParam.setType(false);
                    matParam.setMemo("添加ERP下发商品信息失败！");
                }
            } else {
                callApiLogSave(matParam, "/open/asrs/mat/v1", "接收ERP下发商品信息失败！！！商品已存在！！！", false);
                matParam.setType(false);
                matParam.setMemo("商品已存在！");
            }
            matParams.add(matParam);
        }
        matSyncParam.setMats(matParams);
        return matSyncParam;
    }
    public void callApiLogSave(MatSyncParam.Mats matParam, String tableName, String response, Boolean bool) {
        apiLogService.save("ERP下发商品信息", tableName, "null", "10.10.10.1",
                "物料编码：" + matParam.getMatnr() + "、物料名称：" + matParam.getMaktx() + "、规格：" + matParam.getSpecs() + "、备注：" + matParam.getMemo(),
                response, bool);
    }

}