Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverViewInfoController.java

@@ -60,9 +60,10 @@ public class DriverViewInfoController {
     public void deleteDriver(@RequestBody DriverViewInfo driverViewInfo) {
         driverViewInfoService.deleteDriver(driverViewInfo.getId());
     }
-        /**
-        * 添加信息
-         */
+
+    /**
+    * 添加信息
+     */
     @PostMapping("/api/addInfo")
     public String addInfo(@RequestBody DriverViewInfo driverViewInfo){
         return driverViewInfoService.addInfo(driverViewInfo);

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TranCarInfoController.java

@@ -7,11 +7,7 @@ import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 import com.yh.saas.plugin.yiliangyiyun.service.ITranCarInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.ITranTaskInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -47,5 +43,15 @@ public class TranCarInfoController {
         return tranCarInfoService.confirmUnloading(tranCarInfo.getId());
     }
 
+    /**
+     * 查发车数量
+     * @param tranCarInfo
+     * @return
+     */
+    @GetMapping("/api/selectTranCarInfoNum")
+    public Integer selectTranCarInfoNum(@RequestBody TranCarInfo tranCarInfo){
+        return tranCarInfoService.selectTranCarInfoNum(tranCarInfo);
+    }
+
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranCarInfo.java

@@ -178,7 +178,6 @@ public class TranCarInfo extends BaseModel<TranCarInfo> {
     /**
      * 合同编号
      */
-    @TableField(exist = false)
     private String contractNo;
     /**
      * 货名

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ITranCarInfoService.java

@@ -1,5 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.IdentityAuthenticationInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.TranCarInfo;
 import com.baomidou.mybatisplus.service.IService;
 import com.yh.saas.plugin.yiliangyiyun.entity.TranTaskInfo;
@@ -26,5 +28,12 @@ public interface ITranCarInfoService extends IService<TranCarInfo> {
      * @return
      */
     String confirmUnloading(String id);
+    /**
+     *
+     * 查发车数量
+     * @param tranCarInfo
+     */
+    Integer selectTranCarInfoNum(TranCarInfo tranCarInfo);
+
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranCarInfoServiceImpl.java

@@ -1,16 +1,14 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverViewInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.TranCarInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.TranTaskInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.TranCarInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverViewInfoService;
@@ -110,4 +108,17 @@ public class TranCarInfoServiceImpl extends ServiceImpl<TranCarInfoMapper, TranC
         }
         return "NG";
     }
+
+    /**
+     *
+     * 查发车数量
+     * @param tranCarInfo
+     */
+    @Override
+    public Integer selectTranCarInfoNum(TranCarInfo tranCarInfo) {
+        Integer count = this.selectCount(new EntityWrapper<TranCarInfo>()
+                .eq("contract_no", tranCarInfo.getContractNo())
+                .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        return count;
+    }
 }