#1

dubin

2026-01-12 4e46937e6311840fd3a146e77bca36908f2d914e

 src/main/java/com/zy/asrs/controller/MatController.java

@@ -11,10 +11,7 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.InOutService;
import com.zy.asrs.service.MatBarcodeService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
@@ -42,8 +39,7 @@
    private MatService matService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private MatBarcodeService matBarcodeService;


    @RequestMapping(value = "/mat/auto/matnr/auth")
    public R autoMatnr(){
@@ -125,17 +121,11 @@
            return R.error("编号已存在");
        }
        Date now = new Date();
        InOut inOut=new InOut();
        mat.setCreateBy(getUserId());
        mat.setCreateTime(now);
        mat.setUpdateBy(getUserId());
        mat.setUpdateTime(now);
        mat.setStatus(1);
        inOut.setMatnr(mat.getMatnr());
        inOut.setMaktx(mat.getMaktx());
        inOut.setColor(mat.getColor());
        inOut.setSpecs(mat.getSpecs());
        inOut.setTemp1("");
        if (!matService.insert(mat)) {
            throw new CoolException("商品档案添加失败，请联系管理员");
        }
@@ -151,17 +141,6 @@
        mat.setUpdateBy(getUserId());
        mat.setUpdateTime(new Date());
        matService.updateById(mat);
        return R.ok();
    }

    /*物料托盘绑定*/
    @RequestMapping(value = "/mat/barcode/auth")
    @ManagerAuth
    public R addBarcodeMatnr(Mat mat) {
        if (Cools.isEmpty(mat.getUnit())){
            return R.error(BaseRes.PARAM);
        }
        matBarcodeService.addBarcodeMatnrTwo(mat);
        return R.ok();
    }