Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java

@@ -259,13 +259,17 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     public DocBaseDTO audit(ProdInOutFormDTO formData) {
         Long id = null;
         DocBaseDTO baseDTO = new DocBaseDTO();
+        String code = null;
         if (null != formData) {
             id = formData.getMain().getId();
             if (StringUtils.isEmpty(id) ||"0".equals(String.valueOf(id))) {
                 baseDTO = saveFormData(formData);
                 id = baseDTO.getId();
+                code = baseDTO.getCode();
             }
-            singleAudit(formData.getMain());
+            ProdInOutDTO dto = formData.getMain();
+            dto.setPi_inoutno(code == null ? dto.getPi_inoutno() : code);
+            singleAudit(dto);
             baseDTO = getBaseDTOById(id,formData.getMain().getPi_class(),formData.getMain().getPi_inoutno());
         }
         return baseDTO;

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/ProdInOutServiceImpl.java

@@ -242,13 +242,17 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     public DocBaseDTO audit(ProdInOutFormDTO formData) {
         Long id = null;
         DocBaseDTO baseDTO = new DocBaseDTO();
+        String code = null;
         if (null != formData) {
             id = formData.getMain().getId();
             if (StringUtils.isEmpty(id) || "0".equals(String.valueOf(id))) {
                 baseDTO = saveFormData(formData);
                 id = baseDTO.getId();
+                code = baseDTO.getCode();
             }
-            singleAudit( formData.getMain());
+            ProdInOutDTO dto = formData.getMain();
+            dto.setPi_inoutno(code == null ? dto.getPi_inoutno() : code);
+            singleAudit(dto);
         }
         baseDTO.setId(id);
         baseDTO.setCode(formData.getMain().getPi_inoutno());