order list

Fancy

2024-12-27 a88810e38083e2543b49032705f9db71ca6a36af

order list

 pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java

@@ -54,4 +54,13 @@
        List<JSONObject> list = sv.queryPlanList();
        return BaseResponseUtils.buildSuccess(list);
    }
    /**
     * 任务看板  查询在产任务看板
     * */
    @GetMapping(path="queryOrderList")
    @Log("查询订单看板")
    public BaseResponse<List<JSONObject>> queryOrderList(){
        List<JSONObject> list = sv.queryOrderList();
        return BaseResponseUtils.buildSuccess(list);
    }
}

 pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java

@@ -7,12 +7,20 @@
import com.dy.common.springUtil.SpringContextUtil;
import com.dy.pmsGlobal.daoOth.OthStatisticWorkloadMapper;
import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
import com.dy.pmsGlobal.daoPr.PrOrderItemMapper;
import com.dy.pmsGlobal.daoPr.PrOrderMapper;
import com.dy.pmsGlobal.daoSta.*;
import com.dy.pmsGlobal.pojoPr.PrOrder;
import com.dy.pmsGlobal.pojoPr.PrOrderItem;
import com.dy.pmsGlobal.pojoSta.*;
import com.dy.pmsGlobal.util.UserUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -37,6 +45,12 @@
    private StaRepairInfoMapper repairInfoDao;
    private PrAssemblyPlanMapper assemblyPlanDao;
    private OthStatisticWorkloadMapper workloadDao;
    private PrOrderMapper orderDao;

    @Autowired
    public void setOrderDao(PrOrderMapper orderDao) {
        this.orderDao = orderDao;
    }

    @Autowired
    public void setDeviceLastDao(StaDeviceLastMapper deviceLastDao) {
@@ -144,4 +158,40 @@
        return map.values().stream().collect(Collectors.toList());*/
        return list;
    }

    public List<JSONObject> queryOrderList() {
        List<JSONObject> list = assemblyPlanDao.queryPlanList();
       /* Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize();
        List<PrOrder> orderList = orderDao.selectAll(params);
        for (PrOrder prOrder : orderList) {
            changeRate(prOrder);
        }*/
        return null;
    }
    private void changeRate(PrOrder prOrder) {
        if (prOrder != null && prOrder.items != null) {
            List<PrOrderItem> items = prOrder.items;
            for (int i = 1; i < items.size(); i++) {
                for (int j = i - 1; j >= 0; j--) {
                    //拿着i依次跟上一个比较,如果产品相同,则上一个记录complete_number - number 如果 > 0 分给i ,如果 < 0 则将 complete_number 置为0
                    if (items.get(j).getProId().intValue() == items.get(i).getProId().intValue()) {
                        int remainNumber = items.get(j).getCompleteNumber() - items.get(j).getNumber();
                        if (remainNumber > 0) {
                            items.get(j).setCompleteNumber(items.get(j).getNumber());
                            items.get(j).setCompleteRate("100.00%");
                            items.get(i).setCompleteNumber(remainNumber);
                            BigDecimal remainBig = new BigDecimal(remainNumber * 100);
                            BigDecimal iNumberBig = new BigDecimal(items.get(i).getNumber());
                            BigDecimal result = remainBig.divide(iNumberBig, 2, RoundingMode.HALF_UP);
                            items.get(i).setCompleteRate(result.toString() + "%");
                        } else {
                            items.get(i).setCompleteNumber(0);
                            items.get(i).setCompleteRate("0.00%");
                        }
                        break;
                    }
                }
            }
        }
    }
}