jiangping
2023-10-16 d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -137,6 +137,9 @@
            for(WorkorderRecordExtListVO model : result){
                //查询生产人员姓名
                initProUser(user,model,allDepartList);
//                BigDecimal s =new BigDecimal(Constants.formatIntegerNum(model.getSalary()));
//                s.divide(new BigDecimal(0),2);
//                model.setSalary(s.doubleValue());
            }
        }
        return PageData.from(new PageInfo<>(result));
@@ -1813,7 +1816,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());