Merge remote-tracking branch 'origin/master'

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java

@@ -95,6 +95,7 @@ public class ProOrderServiceImpl implements IProOrderService {
      */
     @Override
     @DS("#header.poolName")
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult subSplitOrder(SplitOrderDTO splitOrderDTO) {
         boolean checkout = true;
         // 校验批次编号是否存在（重复问题）

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java

@@ -225,7 +225,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
      */
     @Override
     @DS("#header.poolName")
-    //@Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public int downProOrderWorkorderByWorkorderIds(String[] workorderIds) {
         List<SapCreateOrder> sapList = null;//回传给sap的工单
         //如果是白坯生成备料单
@@ -311,7 +311,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                 R<List<Map<String, String>>> r = remoteSapService.SapCreateOrder(sapList);
                 logger.info("sap工单回传：" + r.getMsg());
                 if (500 == r.getCode()) {
-                    logger.error("sap工单回传：" + r.getMsg());
+                    logger.error("sap工单回传：(sap订单创建)" + r.getMsg());
                     return 0;
                 }
                 List<Map<String, String>> returnMaps = r.getData();