Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

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

@@ -5,6 +5,7 @@ import com.steerinfo.dil.feign.ColumnDataFeign;
 import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.AmsDispatchSaleOrderMapper;
+import com.steerinfo.dil.mapper.AmsSaleOrderMapper;
 import com.steerinfo.dil.model.AmsDispatchSaleOrder;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
 import com.steerinfo.dil.service.impl.AmsDispatchSaleOrderServiceImpl;
@@ -68,6 +69,10 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     EASDeleteUtil easDeleteUtil;
     @Autowired
     EASCapacityTestUtil easCapacityTestUtil;
+
+    @Autowired
+    private AmsSaleOrderMapper amsSaleOrderMapper;
+
     private final SimpleDateFormat sdfDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     @ApiOperation(value="查询未上报销售订单信息")
@@ -952,7 +957,8 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         if (con != null && !con.equals("undefined") && !con.equals("null")) {
             mapValue.put("con", "%" + con + "%");
         }
-        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);
+        //根据时间段查询数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getHaveCarTruckNoList(mapValue);
@@ -1093,6 +1099,17 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     @Transactional
     public RESTfulResult updateCarAddress(@RequestBody Map<String, Object> mapValue) throws Exception {
         int result = amsSaleOrderService.updateCarAddress(mapValue);
+        //查询单拼的数据
+        try {
+            BigDecimal orderId = (BigDecimal) mapValue.get("orderId");
+            BigDecimal capacityIdS=amsSaleOrderMapper.queueSingle(orderId);
+            if (capacityIdS !=null){
+                //删除单拼
+                amsSaleOrderMapper.delectQueueS(capacityIdS);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
         if (result == 0) {
             // 如果返回结果为0，则认定是关闭了车辆
             BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId"));

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

@@ -0,0 +1,18 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+@FeignClient(value = "DIL-RMS-API-DEV", url = "${openfeign.RmsFeign.url}")
+public interface RmsFeign {
+    //修改运力
+    @PostMapping(value = "api/v1/rms/rmscapacity/updateCapacity")
+    Map<String, Object> updateCapacity(@RequestBody Map<String, Object> map);
+
+}

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

@@ -188,6 +188,12 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     Integer getDispachSwitch();
 
+    //删除单拼数据
+    int delectQueueS(BigDecimal capacityIdS);
+
+    //查询单拼数据
+    BigDecimal queueSingle(BigDecimal orderId);
+
     Map<String, Object> getSteelOrderMap(BigDecimal saleOrderMaterialId);
 
     int updateOldSaleOrderUpload(BigDecimal saleOrderId);

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.feign.OtmsFeign;
+import com.steerinfo.dil.feign.RmsFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.*;
@@ -97,6 +98,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Autowired
     OtmsFeign otmsFeign;
 
+    @Autowired
+    RmsFeign rmsFeign;
+
     @Override
     public List<Map<String, Object>> getSaleOrderInfo(Map<String, Object> map) {
         return amsSaleOrderMapper.getSaleOrderInfo(map);
@@ -910,6 +914,15 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             BigDecimal isSteel = new BigDecimal(1);
             // 得到运力id
             BigDecimal capacityId = amsSaleOrderMaterialMapper.getCapacityId(capacityNumber);
+            try{
+                Map<String,Object> map1=new HashMap<>();
+                map1.put("capacityNumber",capacityNumber);
+                map1.put("capacityTel",driverTel);
+                //在得到司机电话后给运力添加电话号码(通过车牌号)
+                rmsFeign.updateCapacity(map1);
+            }catch (Exception e){
+                e.printStackTrace();
+            }
             if (capacityId == null) {
                 return 0;
             }

src/main/resources/application-prod.yml

@@ -22,6 +22,8 @@ openfeign:
      url: ${JOINFEIGN_URL:172.16.33.166:8066}
    OTMSFeign:
      url: ${OTMSFEIGN_URL:172.16.33.166:8038}
+   RmsFeign:
+     url: ${RMSFEIGN_URL:172.16.33.166:8060}
  #正式环境端口
 
 mvc:

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

@@ -4646,4 +4646,18 @@
     SET ASO.INSERT_UPDATE_REMARK = '物流上传金蝶成功'
     WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
   </update>
+
+  <delete id="delectQueueS">
+        delete from QMS_QUEUE_LIST qql
+        where qql.LIST_ID=#{capacityIdM}
+    </delete>
+
+  <select id="queueSingle" resultType="java.math.BigDecimal">
+        select qql.LIST_ID
+        from OMSTRUCK_ORDER oo
+        LEFT JOIN QMS_QUEUE_LIST qql
+        on qql.capacity_id=oo.capacity_id
+        where oo.order_id=#{orderId}
+    </select>
+
 </mapper>

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

@@ -851,6 +851,8 @@
 
   </select>
 
+
+
   <!-- 查询销售订单中的总重量 -->
   <select id="getMaterialWeightByOrderId" parameterType="DECIMAL" resultType="DECIMAL">
     select sum(ASM.MATERIAL_WEIGHT)