Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev

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

@@ -141,6 +141,8 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
                     .build();
         }
 
+        bean = baseRDao.insert(bean);
+
         //发运单明细
         List<MesShippingOrderManagementDetail> detailInsertList = new ArrayList<>();
 
@@ -164,7 +166,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         });
 
         detailService.insertBatch(detailInsertList);
-        bean = baseRDao.insert(bean);
+
         return bean;
     }