#

zjj

2025-04-14 d0a69f760d5bb8361dc35ac4f4f98243e0409144

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

@@ -1,6 +1,8 @@
package com.zy.asrs.utils;

import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.result.Pakin;
import com.zy.common.model.LocTypeDto;

/**
@@ -8,10 +10,23 @@
 */
public class VersionUtils {

    public static boolean checkLocType(LocMast loc, LocTypeDto dto){
        //库位类型必须和传入的库位信号一致
        if (loc.getLocType1().equals(dto.getLocType1())) {
            return true;
        }
        return false;
    }

    public static boolean locMoveCheckLocTypeComplete(LocMast loc, LocTypeDto dto) {
        // 如果源库位是高库位，目标库位是低库位
        return dto.getLocType1().equals(loc.getLocType1());
    }


    // 业务 ----------------------------------------------------------------------

//    public static void setWrkDetl(WrkDetl wrkDetl, Mat mat) {
    //    public static void setWrkDetl(WrkDetl wrkDetl, Mat mat) {
//        wrkDetl.setMatnr(matCode.getMatNo()); // 物料编号
//        wrkDetl.setMaktx(matCode.getMatName()); // 物料描述
//        wrkDetl.setLgnum(matCode.getStr2()); // 规格
@@ -110,12 +125,24 @@
//        wrkDetl.setSupplier(orderDetl.getSupplier()); // 序列码
//        wrkDetl.setAltme(orderDetl.getUnit()); // 单位
//    }
    public static void setPakin(Pakin pakin, Mat mat) {
        pakin.setMatnr(mat.getMatnr());
        pakin.setMaktx(mat.getMaktx());
        pakin.setName(mat.getName());
        pakin.setSpecs(mat.getSpecs());
        pakin.setModel(mat.getModel());
        pakin.setUnit(mat.getUnit());
        pakin.setBarcode(mat.getBarcode());
        pakin.setItemNum(Integer.valueOf(mat.getItemNum()));
        pakin.setPrice(mat.getPrice());
        pakin.setWeight(mat.getWeight());
    }


    /**
     *  库位移转时类型检测
     * 库位移转时类型检测
     **/
    public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
    public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto) {
        // 如果源库位是高库位，目标库位是低库位
        if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
            return false;