手动报工修改、工单查询增加工单状态多选条件、工程巡检根据条件获取物料

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/ProcedureOnSiteService.java

@@ -207,13 +207,13 @@ public class ProcedureOnSiteService implements IProcedureOnSiteService {
                     .build();
         }
 
+        BeanUtils.copyProperties(mesOnSiteOrderDetail, onSiteOrderDetail);
         String updateMemoResult = updateOnSiteOrderDetailMemo(mesOnSiteOrderDetail, onSiteOrderDetail);
 
         if (!StringUtils.isEmpty(updateMemoResult)) {
             updateResultMap.put("UPDATE_MEMO_RESULT", updateMemoResult);
         }
 
-        BeanUtils.copyProperties(mesOnSiteOrderDetail, onSiteOrderDetail);
         onSiteOrderDetail.setSystemSyncStatus(MesPcnExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
         ConvertBean.serviceModelUpdate(onSiteOrderDetail, userName);
         mesOnSiteOrderDetailRDao.save(onSiteOrderDetail);