#

luxiaotao1123

2022-04-23 4072a7775f72a186b0f4b6e48cdef40b3c2d7f5a

#

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

@@ -316,15 +316,15 @@
                } finally {
                    try {
                        // ä¿å­˜æŽ¥å£æ—¥å¿—
//                        apiLogService.save(
//                                "打包下线帮托上报",
//                                MesConstant.URL + MesConstant.PACK_DOWN_URL,
//                                null,
//                                "127.0.0.1",
//                                JSON.toJSONString(mesCombParam),
//                                response,
//                                success
//                        );
                        apiLogService.save(
                                "打包下线帮托上报",
                                MesConstant.URL + MesConstant.PACK_DOWN_URL,
                                null,
                                "127.0.0.1",
                                JSON.toJSONString(mesCombParam),
                                response,
                                success
                        );
                    } catch (Exception e) { log.error("", e); }
                }


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

@@ -12,6 +12,7 @@
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -320,7 +321,6 @@
            throw new CoolException(barcode + "重复提交");
        }
        Date now = new Date();
        // todo:luxiaotao è§£æžæ¡ç è§„则，获取物料代码
        pack = new Pack(
                barcode,    // æ¡ç [非空]
                null,    // å•†å“ç¼–号
@@ -336,16 +336,22 @@
        if (!packService.insert(pack)) {
            throw new CoolException("服务器内部错误，请联系管理员");
        }
        Mat mat = new Mat();
        mat.setTagId(tagService.getTop().getId());
        mat.setMatnr(barcode);
        mat.setMaktx(barcode);
        mat.setStatus(1);
        mat.setCreateTime(now);
        mat.setUpdateTime(now);
        mat.setMemo("打包上线");
        if (!matService.insert(mat)) {
            throw new CoolException("服务器内部错误，请联系管理员");

        Mat analyse = MatUtils.analyseMat(barcode);
        Mat mat = matService.selectByMatnr(analyse.getMatnr());
        if (mat == null) {
            mat = new Mat();
            // todo
            mat.setTagId(tagService.getTop().getId());
            mat.setMatnr(analyse.getMatnr());
            mat.setMaktx(barcode);
            mat.setStatus(1);
            mat.setCreateTime(now);
            mat.setUpdateTime(now);
            mat.setMemo("打包上线");
            if (!matService.insert(mat)) {
                throw new CoolException("服务器内部错误，请联系管理员");
            }
        }
    }


 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java

@@ -77,15 +77,15 @@
        } finally {
            try {
                // ä¿å­˜æŽ¥å£æ—¥å¿—
//                apiLogService.save(
//                        "成品库入库上报",
//                        MesConstant.URL + MesConstant.PAKIN_URL,
//                        null,
//                        "127.0.0.1",
//                        JSON.toJSONString(pakinParam),
//                        response,
//                        success
//                );
                apiLogService.save(
                        "成品库入库上报",
                        MesConstant.URL + MesConstant.PAKIN_URL,
                        null,
                        "127.0.0.1",
                        JSON.toJSONString(pakinParam),
                        response,
                        success
                );
            } catch (Exception e) { log.error("", e); }
        }
        return SUCCESS;

 src/main/java/com/zy/asrs/utils/MatUtils.java

New file
@@ -0,0 +1,30 @@
package com.zy.asrs.utils;

import com.core.exception.CoolException;
import com.zy.asrs.entity.Mat;
import lombok.extern.slf4j.Slf4j;

/**
 * Created by vincent on 2022/4/23
 */
@Slf4j
public class MatUtils {

    //
    public static Mat analyseMat(String uuid) {
        try {
            String[] split = uuid.split("-");
            String matnr = split[0] + "-" + split[1];
            String serial = split[2];
            Mat mat = new Mat();
            mat.setMatnr(matnr);
            mat.setBarcode(serial);
            mat.setModel(split[0]);
            return mat;
        } catch (Exception e) {
            log.error("", e);
            throw new CoolException(uuid + "条码打包上线错误");
        }
    }

}

 version/doc/ÉÌÆ·µµ°¸Excelµ¼ÈëÄ£°å.xlsx

Binary files differ