bug

jiangping

2023-12-06 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5

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

@@ -137,6 +137,8 @@
            for(WorkorderRecordExtListVO model : result){
                //查询生产人员姓名
                initProUser(user,model,allDepartList);
//                int s= Constants.formatIntegerNum(model.getSalary());
//                model.setSalaryYuan(new BigDecimal(s).divide(new BigDecimal(100),2));
            }
        }
        return PageData.from(new PageInfo<>(result));
@@ -1766,7 +1768,7 @@
                    wreev.setDuration("-");
                }
                wreev.setSalaryType(re.getSalaryType());
                wreev.setSalaryPrice(re.getSalary());
                wreev.setSalaryPrice(re.getSalaryYuan());
                list.add(wreev);

        }
@@ -1813,7 +1815,7 @@
            wreev.setProcedureName(re.getProcedureName());
            wreev.setUnintname(unintname);
            if(re.getOmodel().getPlanNum() != null){
                wreev.setPlanNum(re.getOmodel().getPlanNum()+unintname );
                wreev.setPlanNum(re.getOmodel().getPlanNum().toString() );
            }
            wreev.setMaterialDonetype(re.getMaterialDonetype());
            wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName());