初始化

野心家

2 天以前 9ac70efe81c1909d63b89f9b18c4f367c0584ceb

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

@@ -12,12 +12,14 @@
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.Review;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
@@ -25,6 +27,7 @@
import com.zy.common.model.MesCombParam;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -34,6 +37,7 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

import java.text.SimpleDateFormat;
import java.util.*;

/**
@@ -84,6 +88,10 @@
    private TestMastService testMastService;
    @Autowired
    private WorkService workService;
    @Autowired
    private PackQualifiedService packQualifiedService;
    @Autowired
    private ReportQueryMapper reportQueryMapper;

    @Value("${mes.url}")
    private String mesUrl;
@@ -670,6 +678,14 @@
        if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
            log.error("申请测试失败");
        }
//        //3.开始测试上报
//        CombParam combParam = new CombParam();
//        combParam.setPackNo(testMast.getBarcode());
//        combParam.setLocNo(locMast.getLocNo());
//        combParam.setPackSts(0);
//        combParam.setStepSts(3);
//        combParam.setRequestTime(DateUtils.convert(now));
//        new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);

    }
    @Override
@@ -706,7 +722,7 @@
            }else if (testMast.getChannel()<=48){
                renUrl=renUrl6;
            }
            return new PostMesDataUtils().postMesData("测试系统",renUrl,startUpTestPACK,review);
            return null;
        }catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();
@@ -786,7 +802,7 @@
                default:
                    log.error("通道有误，请查看！");
            }
            return new PostMesDataUtils().postMesData("测试系统",renUrl,suspendTestPACK,review);
            return null;
        }catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();
@@ -794,5 +810,111 @@
            return FAIL.setMsg(e.getMessage());
        }
    }

    /*
    * 测试库信息
    * */
    @Override
    @Transactional
    public List<LocMast> packTestBasicInformation() {
        List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O")
                .and().ne("loc_sts","X"));
        for (LocMast locMast:locMasts) {
            LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
            if(Cools.isEmpty(locDetl)){
                locMast.setMk("无信息");
            }else{
                locMast.setMk(locDetl.getMatnr());
            }
        }
        return locMasts;
    }
    /*
     * 测试库使用情况
     * */
    @Override
    @Transactional
    public List<PackUsageRate> packUsageRate() {
        ArrayList<PackUsageRate> packUsageRates = new ArrayList<>();
        for (int i = 1 ;i<5;i++){
            PackUsageRate packUsageRate = new PackUsageRate();
            packUsageRate.setTotal(locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_type1", i)));
            packUsageRate.setCurrentQuantity(locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_type1", i).and().ne("loc_sts","O")));
            packUsageRates.add(packUsageRate);
        }
        return packUsageRates;
    }

    @Data
    public static class PackUsageRate{
        private int total;
        private int currentQuantity;
    }

    @Data
    public static class PackUsageRate2{
        private int total;
        private int qualified;
        private int unqualified;
        private String week;
    }
    /*
     * 测试库合格数
     * */
    @Override
    @Transactional
    public List<PackUsageRate2> packQualified() {
        Date now = new Date();
        ArrayList<PackUsageRate2> packUsageRates = new ArrayList<>();
        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
        for(int i=1;i<8;i++){
            Date date7 = Utils.timeYesterday(now,i);
            PackUsageRate2 packUsageRate7 = new PackUsageRate2();
            packUsageRate7.setTotal(packQualifiedService.selectTotal(date7,now));
            packUsageRate7.setQualified(packQualifiedService.selectCurrentQuantity(true,date7,now));
            packUsageRate7.setUnqualified(packQualifiedService.selectCurrentQuantity(false,date7,now));
            String formattedDate = sdf.format(date7);
            int month = Integer.parseInt(formattedDate.substring(5, 7));
            int day = Integer.parseInt(formattedDate.substring(8, 10));
            packUsageRate7.setWeek(month+"-"+day);
            packUsageRates.add(packUsageRate7);
            now=date7;
        }

        return packUsageRates;
    }

    /*
     * 测试库合格数
     * */
    @Override
    @Transactional
    public List<PackUsageRate2> chartAxisEvening() {
        Date now = new Date();
        ArrayList<PackUsageRate2> packUsageRates = new ArrayList<>();
        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
        for(int i=1;i<13;i++){
            Date date7 = Utils.timeYesterday1(now,i);
            PackUsageRate2 packUsageRate7 = new PackUsageRate2();
            packUsageRate7.setTotal(packQualifiedService.selectTotal1(date7,now));
            packUsageRate7.setQualified(packQualifiedService.selectCurrentQuantity1(true,date7,now));
            packUsageRate7.setUnqualified(packQualifiedService.selectCurrentQuantity1(false,date7,now));
            String formattedDate = sdf.format(date7);
            int hour= date7.getHours();
            packUsageRate7.setWeek(hour+"");
            packUsageRates.add(packUsageRate7);
            now=date7;
        }
        return packUsageRates;
    }

    /*
     * 测试库合格数
     * */
    @Override
    @Transactional
    public List<WorkChartAxis> chartAxisMorning() {
        return reportQueryMapper.getChartAxisMorning();
    }
    /*...........................赣州新增..............以上.............赣州新增...........................*/
}