Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev

jiangping

2023-08-28 d0323f5d8009b38ae89ab4da304da47de6df792e

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

@@ -1813,7 +1813,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());