Merge pull request 'develop' (#268) from develop into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/268

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

@@ -97,13 +97,19 @@ public class EmisTmsSiteBatchController extends EmisBaseController
 
     /**
      * 用于批次批量上传使用
+     *
      * @param emisTmsSiteBatch
      * @return
      */
     @GetMapping("/listBySupplerAndCarNo")
-    public TableDataInfo listBySupplerAndCarNo(EmisTmsSiteBatch emisTmsSiteBatch)
+    public TableDataInfo listBySupplerAndCarNo(EmisTmsSiteBatch emisTmsSiteBatch) {
-    {
+        if (StringUtils.isNotBlank(emisTmsSiteBatch.getBatchNo())) {
-        List<EmisTmsSiteBatch> list = emisTmsSiteBatchService.selectTmsSiteBatchBySupplerAndCarNo(emisTmsSiteBatch.getSupplierCode(),emisTmsSiteBatch.getCarNo(),emisTmsSiteBatch.getEtd());
+            EmisTmsSiteBatch queryByBatchNo = new EmisTmsSiteBatch();
+            queryByBatchNo.setBatchNo(emisTmsSiteBatch.getBatchNo());
+            List<EmisTmsSiteBatch> list = emisTmsSiteBatchService.selectEmisTmsSiteBatchList(queryByBatchNo);
+            return getDataTable(list);
+        }
+        List<EmisTmsSiteBatch> list = emisTmsSiteBatchService.selectTmsSiteBatchBySupplerAndCarNo(emisTmsSiteBatch.getSupplierCode(), emisTmsSiteBatch.getCarNo(), emisTmsSiteBatch.getEtd());
         return getDataTable(list);
     }
 

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

@@ -13,3 +13,4 @@ public @interface WaybillLightCount {
 }
 
 
+

emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOther.java

@@ -50,3 +50,4 @@ public class EmisWaybillOther extends BaseEntity {
 }
 
 
+

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

@@ -79,3 +79,4 @@ public interface EmisWaybillOtherMapper extends BaseMapper<EmisWaybillOther> {
 }
 
 
+

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

@@ -3381,6 +3381,9 @@ public class EmisBaseService {
       * @return
       */
      public EmisCustomerUser createMoneyCustomerUser(EmisCustomerUser emisCustomerUser) {
+         if(Objects.isNull(emisCustomerUser)||StringUtils.isBlank(emisCustomerUser.getPhone())){
+             return new EmisCustomerUser();
+         }
          // 直接返回客户
          if (emisCustomerUser.getCustomerCode() != null) {
              return emisCustomerUser;