更新测试管理搜索功能

野心家

2024-07-07 3c8343535bec2a53855956e25598e2271fc84c0d

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

@@ -20,6 +20,8 @@
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.utils.NodeUtils;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -64,6 +66,8 @@
    private CommonService commonService;
    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private ConfigService configService;

    @Value("${mes.inPath}")
    private String inpath;
@@ -604,7 +608,16 @@
            matNew.setMatnr(param.getPackNo());
            matNew.setMaktx(param.getPackName());
            matNew.setManuDate(param.getRequestTime());
            matNew.setDeadWarn(480);//8小时  480分钟
            matNew.setDeadWarn(1440);//6小时  360分钟  24小时  1440分钟
            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "JingZhiTime"));
            if (!Cools.isEmpty(config)){
                try{
                    int time = Integer.parseInt(config.getValue());
                    matNew.setDeadWarn(time);//6小时  360分钟  24小时  1440分钟
                }catch (Exception e){

                }
            }
            matNew.setCreateBy(9999L);//9999表示erp下发
            matNew.setCreateTime(now);
            matNew.setUpdateBy(9999L);//9999表示erp下发
@@ -778,46 +791,9 @@
        return testMast;
    }


    @Override
    @Transactional
    public Boolean testFinish(Review review) {
        Boolean success=true;
        Wrapper wrapper = new EntityWrapper<TestMast>()
                .eq("loc_no", review.getLocNo())
                .eq("barcode", review.getBarcode())
                .eq("user_Id", review.getUserId());
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
        if (null == locMast ||locMast.getPackStatus()!=2){
            throw new CoolException("产品状态不是 2:测试中");
        }else if (!review.getBarcode().equals(locMast.getBarcode())){
            throw new CoolException("pack码不同");
        }
        TestMast testMast = testMastService.selectOne(wrapper);
        if(null != testMast){
            if (testMast.getStatus()==3){
                Date date = new Date();
                locMast.setPackStatus(3);
                locMast.setModiTime(date);
//                CombParam combParam = new CombParam();
//                combParam.setPackNo(locMast.getBarcode());
//                combParam.setLocNo(locMast.getLocNo());
//                combParam.setPackSts(3);
//                combParam.setRequestTime(DateUtils.convert(new Date()));
//                new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);

                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 {
                throw new CoolException("测试状态不是 3:测试中");
            }
        } else {
            throw new CoolException("状态异常");
        }
        return success;
        return null;
    }

    @Override