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

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

@@ -210,4 +210,6 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     //查询车牌号是否是黑名单
     int isBlackList(String capacityNumber);
 
+    String selectSaleGroupCode(String saleGroup);
+
 }

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

@@ -567,18 +567,19 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         if (receiveId == null || receiveId.intValue() == 0) {
             receiveId = amsSaleOrderMapper.findReceiveId(mapValue.get("receiveName"));
             if (receiveId == null) {
-                if(mapValue.get("receiveName")!=null){
-                    //自动注册收货客户
-                    Map<String, Object> res = joinFeign.registerConsignee(mapValue);
-                    if("succeed".equals(res.get("status"))){
-                        receiveId=DataChange.dataToBigDecimal(res.get("data"));
-                    }else{
-                        System.out.println(res);
-                        throw new Exception("注册收货客户失败！请手动注册！");
-                    }
-                }else{
-                    throw new Exception("没有输入下单客户！！！");
-                }
+                //if(mapValue.get("receiveName")!=null){
+                //    //自动注册收货客户
+                //    Map<String, Object> res = joinFeign.registerConsignee(mapValue);
+                //    if("succeed".equals(res.get("status"))){
+                //        receiveId=DataChange.dataToBigDecimal(res.get("data"));
+                //    }else{
+                //        System.out.println(res);
+                //        throw new Exception("注册收货客户失败！请手动注册！");
+                //    }
+                //}else{
+                //
+                //}
+                throw new Exception("下单客户不存在！！！");
             }
             //判断该收货客户有没有绑定片区
             BigDecimal saleAreaId = amsSaleOrderMapper.selectSaleAreaId(receiveId);
@@ -601,6 +602,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         String isSelfMention = (String) mapValue.get("isSelfMention");
         // 备注
         String saleRemark = (String) mapValue.get("saleRemark");
+
         // 收款客户
         String saleOrderReceiveCustomer = (String) mapValue.get("saleOrderReceiveCustomer");
         // 业务员
@@ -624,6 +626,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         amsSaleOrder.setSaleOrderIsselfMention(isSelfMention);
         amsSaleOrder.setSaleOrderId(saleOrderId);
         amsSaleOrder.setSalerId(salerId);
+
         // 设置钢材订单
         amsSaleOrder.setSaleType(new BigDecimal(1));
         amsSaleOrder.setSaleNumber(DataChange.generateEightDigitsNumber("WXSDD",saleOrderId.intValue(),"-"));

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

@@ -4452,6 +4452,7 @@
     SELECT RC.CONSIGNEE_ID AS "receiveId"
     FROM RMS_CONSIGNEE RC
     WHERE RC.CONSIGNEE_COMPANY_NAME = #{receiveName}
+    AND RC.CONSIGNEE_CODE IS NOT NULL
   </select>
 
   <select id="findSalerId" parameterType="java.lang.String" resultType="DECIMAL" >
@@ -4719,5 +4720,9 @@
     FROM RMS_CAPACITY
     WHERE CAPACITY_NUMBER=#{capacityNumber} AND CAPACITY_BLACKLIST='是'
   </select>
+  <select id="selectSaleGroupCode" resultType="java.lang.String" parameterType="string">
+      SELECT RSA.AREA_CODE FROM RMS_SALE_AREA RSA
+      WHERE RSA.AREA_NAME = #{saleGroup}
+  </select>
 
 </mapper>