Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/service/impl/JxlsExportTestServiceImpl.java

@@ -18,6 +18,8 @@ import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBo
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -233,10 +235,27 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
 
     }
 
+    /**
+     * 从http中获得 Inputstream
+     *
+     * @param url http地址
+     * @return inputstream
+     * @throws java.io.IOException IOException
+     */
+    private static InputStream getInputStreamFromHttp(String url) throws IOException {
+        URL downUrl = new URL(url);
+        HttpURLConnection connection = (HttpURLConnection) downUrl.openConnection();
+        connection.connect();
+        if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
+            return connection.getInputStream();
+        }
+        return null;
+    }
+
     //获取图片的字节码，临时使用
     private static byte[] getImageBytes(String imagePath) throws IOException {
         byte imageBytes[] = null;
-        InputStream is = JxlsExportTestServiceImpl.class.getClass().getResourceAsStream(imagePath);
+        InputStream is = getInputStreamFromHttp(imagePath);
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         byte bytes[] = new byte[1024];
         int lens = -1;

src/main/java/com/aoyang/tms/service/impl/WorkOrderServiceImpl.java

@@ -102,7 +102,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         List<Integer> statusList = new ArrayList<>();
         statusList.add(WorkOrderEnum.TODO.orderStatus());
         statusList.add(WorkOrderEnum.GOTO_ZHUANGCHE_SPOT.orderStatus());
-        statusList.add(WorkOrderEnum.GOTO_XIECHE_SPOT.orderStatus());
+        statusList.add(WorkOrderEnum.ZHUANGCHE_WAIT.orderStatus());
         statusList.add(WorkOrderEnum.ZHUANGCHE_RESULT_SUBMIT.orderStatus());
         queryWrapper.in("order_status", statusList);
         queryWrapper.orderByAsc("plan_reach_time");

src/main/java/com/aoyang/tms/service/impl/WorkerServiceImpl.java

@@ -153,11 +153,7 @@ public class WorkerServiceImpl implements WorkerService {
         try {
             WorkOrder workOrder = workOrderService.getById(workOrderParam.getId());
             if (workOrder != null) {
-                //1.车辆进入出车前检车状态
-                Truck truck = truckService.getById(workOrder.getTruckId());
-                truck.setTmsStatus(TmsTruckStatus.PRE_CHECK);
-                truckService.updateById(truck);
-                //2.订单进入装车等待状态，
+                //1.订单进入装车等待状态，
                 if (workOrder.getType() == 1) {
                     workOrder.setOrderStatus(WorkOrderEnum.ZHUANGCHE_WAIT.orderStatus());
                 } else {
@@ -165,7 +161,7 @@ public class WorkerServiceImpl implements WorkerService {
                 }
                 workOrderService.updateById(workOrder);
 
-                //3 记录日志
+                //2 记录日志
                 if (workOrder.getType() == 1) {
                     workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_POINT_ARRIVED, workOrder);
                 } else {