修改不

src/main/java/com/steerinfo/dil/controller/BMSController.java

@@ -872,9 +872,6 @@ public class BMSController extends BaseRESTfulController {
                 files.add(temp);
             }
         }
-        if(files.size() < 1){
-            return failed("没有上传图片！");
-        }
         //上传图片
         try{
             for(int i=0;i<files.size();i++){
@@ -893,6 +890,15 @@ public class BMSController extends BaseRESTfulController {
         return bmstruckFeign.updateTruckDetail(map);
     }
 
+    @PostMapping("addTruckDetail")
+    @ApiOperation(value = "直接修改汽运详单")
+    RESTfulResult addTruckDetail(@RequestBody Map<String,Object> map) {
+        if(map==null){
+            return failed("参数为空!");
+        }
+        return bmstruckFeign.addTruckDetail(map);
+    }
+
     @ApiOperation("查询发票图片")
     @PostMapping("/getStatementPhoto")
     public List<String> getStatementPhoto(@RequestParam BigDecimal statementId) throws Exception{

src/main/java/com/steerinfo/dil/controller/OTMSController.java

@@ -77,7 +77,7 @@ public class OTMSController {
 
     @ApiOperation(value = "新增抵达")
     @PostMapping(value = "/addtmstruckArrivalResult")
-    public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber") String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, MultipartRequest request) throws Exception {
+    public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber") String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, Long arrivalTime,  MultipartRequest request) throws Exception {
         //添加到files数组
         List<MultipartFile> files = new ArrayList<>();
         int index=-1;
@@ -114,7 +114,8 @@ public class OTMSController {
             url += imageFileUtils.updateFile(file,i)+';';
         }
         mapValue.put("url",url);
-        return otmsFeign.addtmstruckArrivalResult(orderNumber,resultArrivalAddress,url);
+        mapValue.put("arrivalTime",arrivalTime);
+        return otmsFeign.addtmstruckArrivalResult(mapValue,orderNumber,resultArrivalAddress,url);
     }
 
     @ApiOperation(value = "新增签收")
@@ -141,12 +142,12 @@ public class OTMSController {
             url += imageFileUtils.updateFile(file,i)+';';
         }
         mapValue.put("url",url);
-        return otmsFeign.addTmstruckReceiptResult(mapValue,num,orderNumber,resultArrivalAddress,imgcount3,imgcount4);
+        return otmsFeign.addTmstruckReceiptResult(mapValue,orderNumber,resultArrivalAddress);
     }
 
     @ApiOperation(value = "新增签收网页端")
     @PostMapping(value = "/addTmstruckReceiptResultForWeb")
-    public synchronized RESTfulResult addTmstruckReceiptResultForWeb(MultipartRequest request, Integer num, String orderNumber, String resultArrivalAddress, Integer imgcount3, Integer imgcount4) throws Exception {
+    public synchronized RESTfulResult addTmstruckReceiptResultForWeb(MultipartRequest request,Long receiptTime, String orderNumber, String resultArrivalAddress) throws Exception {
         //添加到files数组
         List<MultipartFile> files = new ArrayList<>();
         int index=-1;
@@ -183,7 +184,8 @@ public class OTMSController {
             url += imageFileUtils.updateFile(file,i)+';';
         }
         mapValue.put("url",url);
-        return otmsFeign.addTmstruckReceiptResult(mapValue,num,orderNumber,resultArrivalAddress,imgcount3,imgcount4);
+        mapValue.put("receiptTime",receiptTime);
+        return otmsFeign.addTmstruckReceiptResult(mapValue,orderNumber,resultArrivalAddress);
     }
 
     @ApiOperation(value="查询当前报警类型")

src/main/java/com/steerinfo/dil/feign/BmstruckFeign.java

@@ -140,6 +140,15 @@ public interface BmstruckFeign {
     @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/updateTruckDetail")
     RESTfulResult updateTruckDetail(@RequestBody Map<String, Object> map);
 
+
+    /**
+     * 直接修改汽运计费详单
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/addTruckDetail")
+    RESTfulResult addTruckDetail(@RequestBody Map<String, Object> map);
+
     /**
      * 展示账单下的详单
      *

src/main/java/com/steerinfo/dil/feign/OtmsFeign.java

@@ -75,11 +75,11 @@ public interface OtmsFeign {
 
     //获得抵达实集
     @PostMapping(value = "/api/v1/otms/tmstruckarrivalresults/addtmstruckArrivalResult")
-    public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber")String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestParam("file") String file);
+    public RESTfulResult addtmstruckArrivalResult(@RequestBody Map<String,Object>  map ,@RequestParam("orderNumber")String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestParam("file") String file);
 
     //添加签收图片
     @PostMapping(value = "/api/v1/otms/pathDisplay/addTmstruckReceiptResult")
-    public  RESTfulResult addTmstruckReceiptResult(@RequestBody Map<String,Object>  mapValaue  , @RequestParam("num") Integer num, @RequestParam("orderNumber")  String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, @RequestParam("imgcount3") Integer imgcount3, @RequestParam("imgcount4")Integer imgcount4);
+    public  RESTfulResult addTmstruckReceiptResult(@RequestBody Map<String,Object>  mapValaue  , @RequestParam("orderNumber")  String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress);
 
     //获得异常信息
     @PostMapping("/api/v1/otms/pathDisplay/getTransportAbnormalInfo")

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -290,4 +290,7 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getColumnAllData(Map<String, Object> map);
 
+
+    int updateRemark(Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -343,6 +343,11 @@ public class UniversalServiceImpl implements UniversalService {
                 responseMapFailedList.add("修改收货客户电话号码失败");
             }
         }
+        //修改备注
+        if(map.get("orderId") != null && map.get("remark") != null && !map.get("remark").equals(oldMes.get("remark"))) {
+            universalMapper.updateRemark(map);
+            responseMapList.add("修改备注成功");
+        }
         //修改司机电话号码
         if(map.get("capacityTel") != null && !map.get("capacityTel").equals(oldMes.get("capacityTel"))) {
             Map<String, Object> updateDriverTelMap = new HashMap<>();

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1537,6 +1537,7 @@
                         R_CARRIER.CARRIER_ID        "carrierId",
                         NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
                         OO.ORDER_STATUS              "carStatus",
+                        OO.REMARK "remark",
                         DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
                                2,'销售已提交',
                                4,'财务已审批',
@@ -1607,4 +1608,10 @@
         WHERE
             DTCR.TABLE_NAME = #{tableName}
     </select>
+    <update id="updateRemark">
+        UPDATE OMSTRUCK_ORDER
+        SET REMARK = #{remark}
+        WHERE ORDER_ID = #{orderId}
+    </update>
+
 </mapper>