Merge branch 'master' of http://111.30.93.211:10101/r/supipe

叶松

2023-11-27 111a401f033749c965f02f58c586a8feafd9afd1

 hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/steelcheck/service/impl/SteelCheckServiceImpl.java

@@ -7,10 +7,7 @@
import com.thhy.general.exception.BasicException;
import com.thhy.general.utils.DeepCopyUtils;
import com.thhy.general.utils.UserInfoUtils;
import com.thhy.mobile.modules.biz.steelcheck.entity.CheckFile;
import com.thhy.mobile.modules.biz.steelcheck.entity.SteelCheckDto;
import com.thhy.mobile.modules.biz.steelcheck.entity.SteelCheckListVo;
import com.thhy.mobile.modules.biz.steelcheck.entity.UpdateCheckResultDto;
import com.thhy.mobile.modules.biz.steelcheck.entity.*;
import com.thhy.mobile.modules.biz.steelcheck.service.SteelCheckService;
import com.thhy.mobile.modules.biz.steelcheckrecord.entity.SteelCheckRecord;
import com.thhy.mobile.modules.biz.steelcheckrecord.mapper.SteelCheckRecordMapper;
@@ -72,7 +69,10 @@
        steelCheckRecord.setSteelProduceNum(produceNum);
        steelCheckRecord.setCreateUser(userInfo.getUserId());
        recordMapper.insert(steelCheckRecord);
        //增加钢筋笼库存
        //增加钢筋笼库存记录
        SteelStockRecord steelStockRecord = new SteelStockRecord(steelProduce);
        steelStockRecord.setSteelRecordId(steelCheckRecord.getCheckId());
        steelStockMapper.insertSteelStockRecord(steelStockRecord);
        int stockRecord = steelStockMapper.countStockByPSRB(new SteelStock(steelProduce));
        if(stockRecord>0){
            //增加钢筋笼库存
@@ -137,7 +137,10 @@
        }
        //更新住状态
        steelProduceMapper.updateQualified(new SteelProduce(updateCheckResultDto.getSteelProduceNum(), steelCheckRecord.getCheckResult(),userInfo.getUserId()));
        //合格状态————————>不合格
        if (steelCheckRecord.getCheckResult()!=3) {
            //减【钢筋笼】库存就记录删除标志
            steelStockMapper.updateSteelStockRecordByCheckId(2,steelCheckRecord.getCheckId());
            //减【钢筋笼】库存
            steelStockMapper.updateMinusStock(new SteelStock(steelProduce));
            //加【钢筋】库存记录
@@ -150,6 +153,8 @@
        }
        //合格状态————————>报废
        if(qualified==1&&updateCheckResultDto.getCheckResult()==3){
            //减【钢筋笼】库存就记录删除标志
            steelStockMapper.updateSteelStockRecordByCheckId(2,steelCheckRecord.getCheckId());
            //减【钢筋笼】库存
            steelStockMapper.updateMinusStock(new SteelStock(steelProduce));
        }
@@ -192,6 +197,9 @@
        //更新住状态
        steelProduceMapper.updateQualified(new SteelProduce(updateCheckResultDto.getSteelProduceNum(), 1,userInfo.getUserId()));

        //钢筋笼】库存就记录删除标志改为未删除
        steelStockMapper.updateSteelStockRecordByCheckId(1,steelCheckRecord.getCheckId());
        //加【钢筋笼】库存
        steelStockMapper.updatePlusStock(new SteelStock(steelProduce));
        //钢筋消耗的理论耗量
        List<SteelConsume> steelConsumeList = steelStockMapper.queryByPSRB(new SteelStock(steelProduce));