tijiao

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.AmsSaleOrder;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
@@ -158,4 +159,9 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     List<Map<String, Object>> getKucunList(Map<String, Object> map);
 
+    BigDecimal selectSaleAreaId(BigDecimal receiveId);
+
+    BigDecimal selectSaleAreaIdByName(String saleArea);
+
+    int bindSaleArea(@Param("receiveId") BigDecimal receiveId, @Param("saleAreaId") BigDecimal saleAreaId);
 }

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

@@ -533,6 +533,23 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             receiveId = amsSaleOrderMapper.findReceiveId(mapValue.get("receiveName"));
             if (receiveId == null) {
                 throw new Exception("您输入的下单客户：" + mapValue.get("receiveName") + "不存在！！");
+            }else {
+                //判断该收货客户有没有绑定片区
+                BigDecimal saleAreaId = amsSaleOrderMapper.selectSaleAreaId(receiveId);
+                if(saleAreaId == null){
+                    //如果片区为null,则绑定片区
+                    //根据片区名称去查找片区ID
+                    if(mapValue.get("saleArea") != null){
+                        String saleAreaName = (String) mapValue.get("saleArea");
+                        saleAreaId = amsSaleOrderMapper.selectSaleAreaIdByName(saleAreaName);
+                        if(saleAreaId == null){
+                            throw new Exception("您输入的销售片区：" + mapValue.get("saleArea") +"不存在！！");
+                        }else{
+                            //更新收货客户下的销售片区
+                            amsSaleOrderMapper.bindSaleArea(receiveId,saleAreaId);
+                        }
+                    }
+                }
             }
         }
         // 是否自提

src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ openfeign:
    ESFeign:
      url: ${ESFEIGN_URL:172.16.33.166:8089}
    ColumnDataFeign:
-     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
    TmsTruckFeign:
       url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
    ImFeign:

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

@@ -1559,6 +1559,7 @@
       and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= a_s_order.UPDATE_TIME
       and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= a_s_order.UPDATE_TIME
     </if>
+    ORDER BY a_s_order.SALE_ORDER_ID DESC
         )
     <where>
       <if test="saleNumber != null">
@@ -4176,6 +4177,11 @@
     SET OO.CAPACITY_ID = #{capacityId}
     WHERE OO.ORDER_ID = #{orderId}
   </update>
+  <update id="bindSaleArea">
+    UPDATE RMS_CONSIGNEE RC
+    SET RC.AREA_ID = #{saleAreaId}
+    WHERE RC.CONSIGNEE_ID = #{receiveId}
+  </update>
 
   <select id="getCarrierByAddress" parameterType="DECIMAL" resultType="java.util.Map" >
     SELECT DISTINCT ACTP.CARRIER_ID "carrierId"
@@ -4502,4 +4508,13 @@
                       </if>
        )
     </select>
+  <select id="selectSaleAreaId" resultType="java.math.BigDecimal" parameterType="decimal">
+        SELECT RC.AREA_ID AS "areaId"
+        FROM RMS_CONSIGNEE RC
+        WHERE RC.CONSIGNEE_ID = #{receiveId}
+  </select>
+  <select id="selectSaleAreaIdByName" resultType="java.math.BigDecimal" parameterType="decimal">
+        SELECT RSA.AREA_ID FROM RMS_SALE_AREA RSA
+        WHERE RSA.AREA_NAME = #{saleAreaName}
+  </select>
 </mapper>