md

emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java

@@ -523,6 +523,9 @@ public class EmisBaseService {
                  // 子单尾数超过总件数,查不到信息
                  return null;
              }
+
+             Integer subSeqNum=Integer.valueOf(subBillSuffix);
+             order.put("subSeqNum", waybill.getOrderSn());
          }
 
 
@@ -708,6 +711,12 @@ public class EmisBaseService {
          order.put("billWeight", billWeight);
          order.put("totalVolume", totalVolume);
 
+         if(isSubBill) {
+             // 子单的序号
+             Integer subSeqNum=Integer.valueOf(subBillSuffix);
+             order.put("subSeqNum", waybill.getOrderSn());
+         }
+
          String packType="";
          if(!StringUtils.isEmpty(waybill.getPackType())){
              packType=DictUtils.getDictLabel("emis_tab_packing_type",waybill.getPackType());
@@ -959,14 +968,31 @@ public class EmisBaseService {
       * @return
       */
      public int createCustomerAddress(EmisCustomerAddress emisCustomerAddressNew){
+
+         int cnt=emisCustomerAddressMapper.checkUnique(emisCustomerAddressNew);
+         if(cnt==0){
+             // 不重复的情况则 创建地址
+             emisCustomerAddressNew.setId(null);
+             emisCustomerAddressNew.preInsert();
+             return emisCustomerAddressMapper.insertEmisCustomerAddress(emisCustomerAddressNew);
+         }else{
+
+             EmisCustomerAddress queryObj=new EmisCustomerAddress();
+             queryObj.setCounty(emisCustomerAddressNew.getCounty());
+             queryObj.setName(emisCustomerAddressNew.getName());
+             queryObj.setPhone(emisCustomerAddressNew.getPhone());
+             queryObj.setProvince(emisCustomerAddressNew.getProvince());
+             queryObj.setCity();
+
+             List<EmisCustomerAddress> existList=emisCustomerAddressMapper.selectEmisCustomerAddressList();
+             // 重复数据需要修正地址的客户归属
+//             get
+
+
+         }
+
          if(!StringUtils.isEmpty(emisCustomerAddressNew.getCustomerCode())){
-             int cnt=emisCustomerAddressMapper.checkUnique(emisCustomerAddressNew);
+
-             if(cnt==0){
-                 // 不重复的情况则 创建地址
-                 emisCustomerAddressNew.setId(null);
-                 emisCustomerAddressNew.preInsert();
-                 return emisCustomerAddressMapper.insertEmisCustomerAddress(emisCustomerAddressNew);
-             }
          }
 
          return 0;

emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml

@@ -214,7 +214,6 @@
     <select id="checkUnique" parameterType="EmisCustomerAddress"  resultType="int">
 		select count(1) from  emis_customer_address
 		where del_flag='0'
-           and customer_code = #{customerCode}
            and country = #{country}
            and `name` = #{name}
            and phone = #{phone}