md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java

@@ -431,11 +431,41 @@ public class EmisSettleSubBillController extends EmisBaseController
                         }
                     }
 
+                     /*
+                        bug:1610
+                        现金账单确认/月结账单确认：应收运费大于等于标准报价，业务确认完帐单后，现金账单确认/月结账单确认界面系统自动确认；
+                        财务也自动确认了
+                        非特殊报价和一口价
+                     */
 
                     EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill();
+
+
+                    // 判断非特殊报价和一口价
+                    EmisWaybill waybill=emisBaseService.getWaybillByBillCode(old.getBillNo());
+                    if( "3".equals(waybill.getCalcFeeType()) ) {
+                        if (waybill.getFreight().compareTo(waybill.getRealFee()) > 0) {
+
+                        }
+                    }
+
+
+                    emisSettleSubBill.setId(id);
+
                     emisSettleSubBill.setConfirmSiteManCode(getLoginUser().getUser().getEmpCode());
                     emisSettleSubBill.setConfirmSiteCode(getLoginUser().getUser().getOwnerSiteCode());
-                    emisSettleSubBill.setId(id);
+
+
+                    // 获取运单费用
+
+
+//                    if(old.getBillFee())
+
+
+
+
+
+
 
                     emisBaseService.confirmBillBySite(emisSettleSubBill);
 

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSupplierController.java

@@ -125,6 +125,16 @@ public class EmisSupplierController extends BaseController
         return AjaxResult.success(emisSupplierService.selectEmisSupplierById(id));
     }
 
+    @GetMapping(value = "/getSupplierByName")
+    public AjaxResult getSupplierByName(EmisSupplier emisSupplier)
+    {
+        if(StringUtils.isEmpty(emisSupplier.getName())){
+            return AjaxResult.error("供应商不存在");
+        }
+        return AjaxResult.success(emisSupplierService.selectEmisSupplierByName(emisSupplier.getName()));
+    }
+
+
     /**
      * 新增公司供应商表
      */

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java

@@ -16,6 +16,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.emis.utils.WaybillHelper;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -80,6 +81,23 @@ public class EmisTmsSiteBatchController extends EmisBaseController
     }
 
 
+    @GetMapping("/getInfoBySupplerAndCarNo")
+    public AjaxResult getInfoBySupplerAndCarNo(EmisTmsSiteBatch emisTmsSiteBatch)
+    {
+        List<EmisTmsSiteBatch> list = emisTmsSiteBatchService.selectTmsSiteBatchBySupplerAndCarNo(emisTmsSiteBatch.getSupplierCode(),emisTmsSiteBatch.getCarNo());
+        if(!CollectionUtils.isEmpty(list)){
+            return  AjaxResult.error("未找到批次信息");
+        }
+
+        if(list.size()>1){
+            return  AjaxResult.error("存在多条批次信息");
+        }
+
+        return AjaxResult.success("成功",list.get(0));
+
+    }
+
+
     /**
      * 根据批次号扫描组批次
      *

emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSupplierMapper.java

@@ -28,6 +28,14 @@ public interface EmisSupplierMapper extends BaseMapper<EmisSupplier>
      */
     public EmisSupplier selectEmisSupplierById(Long id);
 
+
+    /**
+     * 根据供应商名称，完全匹配
+     * @param name
+     * @return
+     */
+    public EmisSupplier selectEmisSupplierByName(String name);
+
     /**
      * 查询列表
      * 

emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java

@@ -34,6 +34,9 @@ public interface EmisTmsSiteBatchMapper extends BaseMapper<EmisTmsSiteBatch>
 
     public EmisTmsSiteBatch selectTmsSiteBatchByBatchNo(String batchNo);
 
+
+    public List<EmisTmsSiteBatch> selectTmsSiteBatchBySupplerAndCarNo(EmisTmsSiteBatch emisTmsSiteBatch);
+
     /**
      * 查询列表
      * 

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

@@ -27,6 +27,14 @@ public interface IEmisSupplierService
      */
     public EmisSupplier selectEmisSupplierById(Long id);
 
+
+    /**
+     * 根据名称完全匹配
+     * @param name
+     * @return
+     */
+    public EmisSupplier selectEmisSupplierByName(String name);
+
     /**
      * 查询公司供应商表列表
      * 

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

@@ -27,6 +27,15 @@ public interface IEmisTmsSiteBatchService
      */
     public EmisTmsSiteBatch selectEmisTmsSiteBatchById(Long id);
 
+
+    /**
+     * 根据供应商编码和运输号获取批次
+     * @param supplierCode
+     * @param carNo
+     * @return
+     */
+    public  List<EmisTmsSiteBatch> selectTmsSiteBatchBySupplerAndCarNo(String supplierCode,String carNo);
+
     /**
      * 查询一级网点TMS组批次列表
      * 

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

@@ -41,6 +41,13 @@ public class EmisSupplierServiceImpl implements IEmisSupplierService
         return emisSupplierMapper.selectEmisSupplierById(id);
     }
 
+    @Override
+    public EmisSupplier selectEmisSupplierByName(String name)
+    {
+        return emisSupplierMapper.selectEmisSupplierByName(name);
+    }
+
+
 
     /**
      * 查询公司供应商表列表

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

@@ -65,6 +65,17 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
         return emisTmsSiteBatchMapper.selectEmisTmsSiteBatchById(id);
     }
 
+    @Override
+    public  List<EmisTmsSiteBatch> selectTmsSiteBatchBySupplerAndCarNo(String supplierCode,String carNo)
+    {
+        EmisTmsSiteBatch emisTmsSiteBatch = new EmisTmsSiteBatch();
+        emisTmsSiteBatch.setSupplierCode(supplierCode);
+        emisTmsSiteBatch.setCarNo(carNo);
+
+        return emisTmsSiteBatchMapper.selectTmsSiteBatchBySupplerAndCarNo(emisTmsSiteBatch);
+    }
+
+
     /**
      * 查询一级网点TMS组批次列表
      * 

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

@@ -134,6 +134,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
+    <select id="selectEmisSupplierByName" parameterType="String" resultMap="EmisSupplierResult">
+        select id, code, name, name_en, settled_type, trans_type, biz_site, biz_site_name, company_name, company_type, licence_no, country, province, city, district, address, fee_item_rel, tel, email, contact, phone, status, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        from emis_supplier a
+        where a.del_flag='0' and a.name = #{name}
+    </select>
+
     <insert id="insertEmisSupplier" parameterType="EmisSupplier" useGeneratedKeys="true" keyProperty="id">
         insert into emis_supplier
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -323,6 +323,12 @@
         where a.id = #{id}
     </select>
 
+    <select id="selectTmsSiteBatchBySupplerAndCarNo" parameterType="EmisTmsSiteBatch" resultMap="EmisTmsSiteBatchResult">
+        select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        from emis_tms_site_batch a
+        where a.del_flag='0' and a.supplier_code = #{supplierCode} and a.car_no = #{carNo} limit 1
+    </select>
+
     <select id="selectTmsSiteBatchByBatchNo" parameterType="String" resultMap="EmisTmsSiteBatchResult">
         select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_tms_site_batch a