#1

dubin

2025-12-20 db11805d2209fd37b24037fce159c7d5a39d8177

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

@@ -10,6 +10,7 @@
import com.zy.common.model.DetlDto;
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;
@@ -28,6 +29,7 @@
    @Autowired
    private WaitPakinService waitPakinService;

    @Transactional
    @Override
    public void comb(List<MatBarcode> list) {
        String zpallet = list.get(0).getZpallet();
@@ -46,6 +48,12 @@
            if (Cools.isEmpty(mat)) {
                throw new CoolException(matBarcode.getMatnr() + "商品档案不存在");
            }

            //对于已经组托过的 模具+托盘 不允许再次组托
            Integer waitPakinCount = waitPakinService.selectByBarcodeAndMatnr(matBarcode.getMatnr(), matBarcode.getZpallet());
            if (waitPakinCount >= 1){
                throw new CoolException("该模具已经组托,商品模具名称:" + matBarcode.getMatnr() + "托盘码:" + matBarcode.getZpallet());
            }
            WaitPakin waitPakin1 = new WaitPakin();
            waitPakin1.sync(mat);
            ///waitPakin1.setProType(dto.getProType());
@@ -56,6 +64,7 @@
            waitPakin1.setIoStatus("N");     // 入出状态
            waitPakin1.setAnfme(1.0);  // 数量
            waitPakin1.setStatus("Y");    // 状态
            waitPakin1.setModel(mat.getName());
            //waitPakin1.setAppeUser(waitPakin.getAppeUser());
            waitPakin1.setAppeTime(now);
            //waitPakin1.setModiUser(waitPakin.getAppeUser());
@@ -66,4 +75,14 @@
            }
        }
    }

    @Override
    public Integer selectCountByMatNr(String matnr) {
        return this.baseMapper.selectCountByMatNr(matnr);
    }

    @Override
    public Integer selectByBarcodeAndMatnr(String matnr, String zpallet) {
        return this.baseMapper.selectByBarcodeAndMatnr(matnr, zpallet);
    }
}