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

topsun/src/main/java/com/huigou/topsun/sap/processOutsource/application/impl/ProcessOutsourceApplicationImpl.java

@@ -34,6 +34,7 @@ import com.huigou.util.StringUtil;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
@@ -64,6 +65,8 @@ public class ProcessOutsourceApplicationImpl extends FlowBroker implements Proce
     private ProcessOutsourceOrderItemRepository processOutsourceOrderItemRepository;
     @Autowired
     private SapPermitApplication sapPermitApplication;
+    @Autowired
+    private TaskExecutor asyncWriteExecutor;
 
     @Override
     protected String saveBizAndApprovalData() {
@@ -166,7 +169,10 @@ public class ProcessOutsourceApplicationImpl extends FlowBroker implements Proce
         //推送到SAP
         this.sendData(processOutsource);
         //创建放行条
-        this.startSapPermit(processOutsource);
+        asyncWriteExecutor.execute(()->
+                //创建放行条
+                this.startSapPermit(processOutsource)
+        );
         processOutsourceRepository.save(processOutsource);
     }
 

topsun/src/main/java/com/huigou/topsun/sap/processOutsource/domain/ProcessOutsourceOrderItem.java

@@ -83,6 +83,18 @@ public class ProcessOutsourceOrderItem extends AbstractEntity {
     @Column(name = "MEINS_NAME")
     private String meinsName;
 
+    /**
+     * 存储地点
+     */
+    @Column(name = "LGORT")
+    private String lgort;
+
+    /**
+     * 存储地点
+     */
+    @Column(name = "LGORT_NAME")
+    private String lgortName;
+
     /**
      * 需求到货日期
      */