完善出库

platform-service/src/main/java/com/platform/service/business/impl/OutStoreFormActivitiServiceImpl.java

@@ -6,6 +6,7 @@ import com.platform.common.constant.CommonConstants;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.IdGeneratorUtils;
+import com.platform.common.util.SecurityUtils;
 import com.platform.dao.entity.activiti.LocalAuditRecord;
 import com.platform.dao.entity.store.OutStoreForm;
 import com.platform.dao.enums.ActivitiFormStatusEnum;
@@ -102,14 +103,17 @@ public class OutStoreFormActivitiServiceImpl extends BaseFormCheckServiceAbstrac
     }
 
     /**
-     * 完成业务
-     *  -自动提交到用友
+     * 完成业务分为2个阶段
+     * 1：主管审核通过，更新出库单状态
+     * 2：自动提交到用友，根据信息更新出库单状态
      * @param actAuditRequest
      */
     @Override
     public String doFinish(ActAuditRequest actAuditRequest) {
         OutStoreForm outStoreForm = new OutStoreForm();
         outStoreForm.setId(actAuditRequest.getId());
+        outStoreForm.setUpdateUserId(SecurityUtils.getUserInfo().getUserId());
+        outStoreForm.setUpdateUserName(SecurityUtils.getUserInfo().getRealName());
         outStoreForm.setStatus(OutStoreStatusEnum.EXECUTING.getValue());
         outStoreFormMapper.updateByPrimaryKeySelective(outStoreForm);
         //yongyouService.addOutForm(actAuditRequest.getId());

platform-service/src/main/java/com/platform/service/customize/BaseFormCheckServiceAbstract.java

@@ -410,6 +410,11 @@ public abstract class BaseFormCheckServiceAbstract implements BaseFormCheckServi
         return updInfo.getObjId();
     }
 
+    /**
+     * 审核结束
+     * @param actAuditRequest
+     * @return
+     */
     @Override
     public String doFinish(ActAuditRequest actAuditRequest) {
         CustomFieldTemplateData updInfo = getById(actAuditRequest.getId());