Merge branch 'master-fix' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java

@@ -440,6 +440,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
             throw exception(ORDER_NOT_EXISTS);
         }
         orderDO.setOrderType(orderType);
+        orderDO.setPickleType(1); // 这里每次设置订单类型都需要重置半泡属性
         handleException(orderId, orderDO, 9);
     }
 

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java

@@ -307,39 +307,41 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
         // 提单直接审批通过
         updateObj.setStatus(2);
         //end  提单直接审批通过
+        if (null != updateReqVO.getNeedBackend() && updateReqVO.getNeedBackend()) {
+            OrderDO order = orderQueryService.getOrderById(Long.valueOf(makeBillOfLading.getOrderId()));
 
-        OrderDO order = orderQueryService.getOrderById(Long.valueOf(makeBillOfLading.getOrderId()));
+            OrderObjectiveDO orderObjectiveDO = orderObjectiveService.getByOrderId(order.getOrderId());
 
-        OrderObjectiveDO orderObjectiveDO = orderObjectiveService.getByOrderId(order.getOrderId());
-
-        //得到订单目的仓
-        String destStr = "";
-        if (null != orderObjectiveDO && null != orderObjectiveDO.getObjectiveWarehouseId()) {
-            WarehouseDO warehouseDO = warehouseService.getWarehouse(orderObjectiveDO.getObjectiveWarehouseId());
-            destStr = warehouseDO.getTitleEn();
-        }
+            //得到订单目的仓
+            String destStr = "";
+            if (null != orderObjectiveDO && null != orderObjectiveDO.getObjectiveWarehouseId()) {
+                WarehouseDO warehouseDO = warehouseService.getWarehouse(orderObjectiveDO.getObjectiveWarehouseId());
+                destStr = warehouseDO.getTitleEn();
+            }
 
-        if (StrUtil.isBlank(order.getContainerNumber())) {
-            throw exception(MAKE_BILL_OF_SELF_NULL);
-        }
-        if (StrUtil.isBlank(order.getTidanNo())) {
-            throw exception(MAKE_BILL_OF_ORDER_NULL);
-        }
+            if (StrUtil.isBlank(order.getContainerNumber())) {
+                throw exception(MAKE_BILL_OF_SELF_NULL);
+            }
+            if (StrUtil.isBlank(order.getTidanNo())) {
+                throw exception(MAKE_BILL_OF_ORDER_NULL);
+            }
 
 
-        FileClient masterFileClient = fileConfigService.getMasterFileClient();
-        String domain = masterFileClient.getDomain();
-        //创建空运的PDF提单
-        String pdfFileName = "/admin/shipment/" + StrUtil.blankToDefault(order.getContainerNumber(), "") + "/pdf/" + StrUtil.blankToDefault(order.getTidanNo(), "") + " " + StrUtil.blankToDefault(order.getMarks(), "") + " " + StrUtil.blankToDefault(destStr, "") + ".pdf";
-        String pdfUrl = domain + pdfFileName;
-        String pdfPath = prePath + pdfFileName;
-        try {
-            AirHtmlToPdfUtil.convertHtmlToPdf(updateObj.getBillContent(), pdfPath);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+            FileClient masterFileClient = fileConfigService.getMasterFileClient();
+            String domain = masterFileClient.getDomain();
+            //创建空运的PDF提单
+            String pdfFileName = "/admin/shipment/" + StrUtil.blankToDefault(order.getContainerNumber(), "") + "/pdf/" + StrUtil.blankToDefault(order.getTidanNo(), "") + " " + StrUtil.blankToDefault(order.getMarks(), "") + " " + StrUtil.blankToDefault(destStr, "") + ".pdf";
+            String pdfUrl = domain + pdfFileName;
+            String pdfPath = prePath + pdfFileName;
+            try {
+                AirHtmlToPdfUtil.convertHtmlToPdf(updateObj.getBillContent(), pdfPath);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            //设置生成的PDF路径
+            updateObj.setImgUrl(pdfUrl);
         }
-        //设置生成的PDF路径
-        updateObj.setImgUrl(pdfUrl);
+
         /*
         String bpmProcessId =
                 bpmCreateServiceFactory.createBmp(SecurityFrameworkUtils.getLoginUserId(),