Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java

@@ -38,8 +38,8 @@ public class ActSarItemsBussEOController extends BaseController<ActSarItemsEO> {
     @PostMapping("/processCreateBuss")
     public ResponseMessage processCreateBuss(String infoJson) throws Exception {
         if (StringUtils.isNotBlank(infoJson)) {
-            actSarItemsEOService.processCreateBuss(infoJson);
-            return Result.success("入库成功");
+            String bussId = actSarItemsEOService.processCreateBuss(infoJson);
+            return Result.success(bussId);
         } else {
             return Result.error("传入数据json不能为空");
         }

adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java

@@ -217,9 +217,10 @@ public class ActSarItemsBussEOService {
      * @Param: [standJson]
      * @Return: void
      */
-    public void processCreateBuss(String standJson) throws Exception{
+    public String processCreateBuss(String standJson) throws Exception{
         Map<String,Object> standMap = new HashMap();
         standMap = JSONObject.parseObject(standJson);
+        String bussId = "";
         if (standMap != null && !standMap.isEmpty()) {
             String prcNum = String.valueOf(standMap.get("prcNum"));
             String pid = String.valueOf(standMap.get("topId"));
@@ -286,7 +287,6 @@ public class ActSarItemsBussEOService {
 //                sarStandardsInfoEO.setMenuId("22179d54d4e640098e29");
 //            }
             //此处判断是否是带入的标准
-            String bussId = "";
             if(StringUtils.isNotBlank(sarBussionessStand.getId())) {
                 bussId = sarBussionessStand.getId();
                 SarBussionessStand query = new SarBussionessStand();
@@ -413,7 +413,7 @@ public class ActSarItemsBussEOService {
             }
         }
 
-
+        return bussId;
     }
 
     private void updateStandFileFieldData(Map<String,Object> addAttInfoMap,Map<String,Object> oldAttInfoMap){