途宝报单bug修改

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderBillsPlansServiceImpl.java

@@ -117,11 +117,11 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
 
             if ("BD".equals(type)) {
 
-                if ("F".equals(wfTaskList.getIfLoaded()) && "F".equals(wfTaskList.getIfUnLoaded()) && "F".equals(wfTaskList.getIfOrder2ed())) {
+                if ("F".equals(wfTaskList.getIfLoaded()) && "F".equals(wfTaskList.getIfUnLoaded()) && ("F".equals(wfTaskList.getIfOrder2ed()) || "T".equals(wfTaskList.getIfOrder2ed()))) {
                     wfTaskList.setBillStatusName("未装车");
-                } else if ("T".equals(wfTaskList.getIfLoaded()) && "F".equals(wfTaskList.getIfUnLoaded()) && "F".equals(wfTaskList.getIfOrder2ed())) {
+                } else if ("T".equals(wfTaskList.getIfLoaded()) && "F".equals(wfTaskList.getIfUnLoaded()) && ("F".equals(wfTaskList.getIfOrder2ed()) || "T".equals(wfTaskList.getIfOrder2ed()))) {
                     wfTaskList.setBillStatusName("未卸车");
-                } else if ("T".equals(wfTaskList.getIfLoaded()) && "T".equals(wfTaskList.getIfUnLoaded()) && "F".equals(wfTaskList.getIfOrder2ed())) {
+                } else if ("T".equals(wfTaskList.getIfLoaded()) && "T".equals(wfTaskList.getIfUnLoaded()) && ("F".equals(wfTaskList.getIfOrder2ed()) || "T".equals(wfTaskList.getIfOrder2ed()))) {
                     wfTaskList.setBillStatusName("已卸车");
                 } else if ("T".equals(wfTaskList.getIfLoaded()) && "T".equals(wfTaskList.getIfUnLoaded()) && "S".equals(wfTaskList.getIfOrder2ed())) {
                     wfTaskList.setBillStatusName("已提交");
@@ -171,7 +171,7 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
 
         vo.setActId(Long.valueOf(actId.toString()));
         vo.setEntityId(orderBillsPlans.getLoadBillsEntityId());
-
+        orderBillsPlans.setActId(Long.valueOf(actId.toString()));
         // 查找照片List
         List<Long> attachIdList = orderBillsPlansMapper.getAttachMngsAttachIdBySysIdAndEntityIdAndActId(orderBillsPlans);
 
@@ -305,7 +305,8 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
 
             String serverName = request.getServerName();
             int serverPort = request.getServerPort();
-            String url = "http://" + serverName + ":" + serverPort + "/attachmngs/img/" + attachId;
+//            String url = "http://" + serverName + ":" + serverPort + "/attachmngs/img/" + attachId;
+            String url = "https://yd.echepei.com/prod-api/attachmngs/img/" + attachId;
             imgVo.setUrl(url);
 
             fileList1.add(imgVo);

ruoyi-system/src/main/resources/mapper/system/OrderBillsPlansMapper.xml

@@ -339,6 +339,9 @@
              , o.unLoadQty unLoadQty
              , o.unLoadDate unLoadDate
              , o.ifOrder2ed ifOrder2ed
+             , o.detourEmptyMile detourEmptyMile
+             , o.detourLoadMile  detourLoadMile
+             , o.detourDesc      detourDesc
         FROM OrderBillsPlans o
                  INNER JOIN LoadBills b
                             ON