Revert "#"

LSH

2022-08-18 a7a5c6df3617f879ed502be8a1895f4bf4be7559

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

@@ -19,6 +19,7 @@
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.expression.spel.ast.NullLiteral;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -589,12 +590,14 @@
        java.sql.Date requestTime = new java.sql.Date(date1.getTime());

        // 生成入库通知档
        Mat mat = matService.selectByMatnr(param.getPackName());
        if (Cools.isEmpty(mat)) {
            throw new CoolException(param.getPackName() + "商品档案不存在");
        }
//        Mat mat = matService.selectByMatnr(param.getPackName());
//        if (Cools.isEmpty(mat)) {
//            throw new CoolException(param.getPackName() + "商品档案不存在");
//        }
        WaitPakin waitPakin = new WaitPakin();
        waitPakin.sync(mat);
//        waitPakin.sync(mat);
        waitPakin.setMatnr(param.getPackName());
        waitPakin.setMaktx(param.getPackName());
        waitPakin.setZpallet(param.getPackNo());   // Pack码
        waitPakin.setIoStatus("N");     // 入出状态
        waitPakin.setAnfme(1.0);  // 数量
@@ -603,6 +606,7 @@
        waitPakin.setAppeTime(requestTime);
        waitPakin.setModiUser(null);
        waitPakin.setModiTime(requestTime);
        waitPakin.setDeadWarn(param.getSettingTimes());
        if (!waitPakinService.insert(waitPakin)) {
            throw new CoolException("保存入库通知档失败");
        }
@@ -616,7 +620,7 @@
                .eq("barcode", review.getBarcode())
                .eq("user_Id", review.getUserId());
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
        if (locMast.getPackStatus()!=1) {
        if (null == locMast ||locMast.getPackStatus()!=1) {
            throw new CoolException("产品状态不是 1:待测试");
        }
        TestMast testMast = testMastService.selectOne(wrapper);
@@ -662,6 +666,10 @@
                if (!testMastService.update(testMast,wrapper)){
                    throw new CoolException("更改测试状态失败");
                }
                locMast.setPackStatus(3);
                if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
                    throw new CoolException("更改产品状态失败");
                }
            }else if (Cools.isEmpty(testMast.getStatus())){
                throw new CoolException("状态异常");
            }else {
@@ -670,6 +678,7 @@
        } else {
            throw new CoolException("状态异常");
        }
        //移库开始，查询目标库位
        LocMast targetLocNo = locMastService.selectOne(new EntityWrapper<LocMast>()
                .eq("row1",2)
                .eq("loc_sts","O")