平台端bug修改

Mr.Zhang

2023-09-13 1462849791e80bfcc9905614cdc1cfafd68d9157

 server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java

@@ -370,7 +370,7 @@
        rParam.setPlanId(pageWrap.getId());
        rParam.setDeleted(Constants.ZERO);
        //已完工数量
//        plan.setDoneNum(0);
        plan.setDoneNum(0);
        //已分配数量
        plan.setDistributNum(0);
        //查询全部投料和产出
@@ -407,8 +407,8 @@
                    tModle.setUrgent(w.getUrgent());
                    tModle.setUpdateTime(w.getUpdateTime());
                    tModle.setRemark(w.getRemark());
                    tModle.setQualifiedNum(0);
                    tModle.setUnqualifiedNum(0);
                    tModle.setQualifiedNum(w.getQualifiedNum());
                    tModle.setUnqualifiedNum(w.getUnqualifiedNum());
                    tModle.setProUserId(w.getProUserId());
                    tModle.setProUserName(w.getProUserName());
                    tModle.setProUserName(w.getProUserName());
@@ -450,13 +450,17 @@
                                    //产出日期
                                    tModle.setProduceDate(r.getCreateTime());
                                }
                                if(Constants.equalsInteger(r.getDoneType(),Constants.ZERO)){
//                                if(Constants.equalsInteger(r.getDoneType(),Constants.ZERO)){
                                    //如果是合格产出
                                    tModle.setQualifiedNum(tModle.getQualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
                                }else{
//                                    tModle.setQualifiedNum(tModle.getQualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
//                                }else{
                                    //如果是不良品
                                    tModle.setUnqualifiedNum(tModle.getUnqualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
                                }
//                                    tModle.setUnqualifiedNum(tModle.getUnqualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
//                                }
                                //如果是合格产出
                                tModle.setQualifiedNum(tModle.getQualifiedNum());
                                //如果是不良品
                                tModle.setUnqualifiedNum(tModle.getUnqualifiedNum());
                            }
                        }
                    }
@@ -857,7 +861,7 @@
            if(!Objects.isNull(plan.getWorkPlansId())){
                //更新主订单数据信息
               if(plansMapper.selectCount(new QueryWrapper<Plans>()
                        .eq("STATUS",Constants.PLAN_STATUS.done)
                        .in("STATUS",0,1,4,5)
                        .eq("DELETED",Constants.ZERO)
                        .ne("id",p.getId())
                        .eq("WORK_PLANS_ID",plan.getWorkPlansId()))<=Constants.ZERO){
@@ -998,7 +1002,7 @@
            if(!Objects.isNull(plan.getWorkPlansId())){
                //更新主订单数据信息
                if(plansMapper.selectCount(new QueryWrapper<Plans>()
                        .eq("STATUS",Constants.PLAN_STATUS.done)
                        .in("STATUS",0,1,4,5)
                        .eq("DELETED",Constants.ZERO)
                        .ne("id",p.getId())
                        .eq("WORK_PLANS_ID",plan.getWorkPlansId()))<=Constants.ZERO){