提货移动版

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -76,6 +76,11 @@ public class ShiroConfig {
             }
         }
         // 配置不会被拦截的链接 顺序判断
+        filterChainDefinitionMap.put("/sys/dict/getDictItems/ship_type", "anon"); //发货类型字典
+        filterChainDefinitionMap.put("/vehicledemandcount/vehicleDemandCount/getVdCountById", "anon"); //获取用车计算数据
+        filterChainDefinitionMap.put("/vehicleinout/vehicleInOut/take", "anon"); //提货
+        filterChainDefinitionMap.put("/logisticsdriver/logisticsDriver/getDriverInfo", "anon"); //查询司机信息
+
         filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录
         filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除
         filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除

jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/controller/VehicleDemandCountController.java

@@ -205,4 +205,18 @@ public class VehicleDemandCountController extends JeecgController<VehicleDemandC
 		 vehicleDemandCountService.updateById(vehicleDemandCount);
 		 return Result.OK("审核完成！");
 	 }
+
+	 /**
+	  * 通过id获取用车计算数据
+	  * @param id
+	  * @return
+	  */
+	 @GetMapping(value = "/getVdCountById")
+	 public Result<?> getVdCountById(@RequestParam(name="id",required=true) String id) {
+		 List<VehicleDemandCount> vdNos = vehicleDemandCountService.getVdCountById(id);
+		 IPage<VehicleDemandCount> page = new Page<>(1, vdNos.size());
+		 page.setRecords(vdNos);
+		 page.setTotal(vdNos.size());
+		 return Result.OK(page);
+	 }
 }

jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/mapper/VehicleDemandCountMapper.java

@@ -15,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface VehicleDemandCountMapper extends BaseMapper<VehicleDemandCount> {
 
     List<VehicleDemandCount> getByVdNo(@Param("vdNo") String vdNo);
+
+    List<VehicleDemandCount> getVdCountById(@Param("id") String id);
 }

jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/mapper/xml/VehicleDemandCountMapper.xml

@@ -13,4 +13,16 @@
         and a.supplier_code = b.supplier_code
         where a.vd_no = #{vdNo}
     </select>
+
+    <select id="getVdCountById" resultType="org.jeecg.modules.tms.outbound.vehicledemandcount.entity.VehicleDemandCount"
+            parameterType="java.lang.String">
+        select a.*, b.tandard_price, b.supplier_name from tms_vehicle_demand_count a
+        left join tms_iogistics_price b
+        on a.car_type = b.car_type
+        and a.car_long = b.car_long
+        and a.pick_up_hub = b.start_city
+        and a.delivery_address = b.target_city
+        and a.supplier_code = b.supplier_code
+        where a.id = #{id}
+    </select>
 </mapper>

jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/IVehicleDemandCountService.java

@@ -15,4 +15,6 @@ public interface IVehicleDemandCountService extends IService<VehicleDemandCount>
 
     List<VehicleDemandCount> getByVdNo(String vdNo);
     void deleteByVdNo(String vdNo);
+
+    List<VehicleDemandCount> getVdCountById(String id);
 }

jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/impl/VehicleDemandCountServiceImpl.java

@@ -34,4 +34,9 @@ public class VehicleDemandCountServiceImpl extends ServiceImpl<VehicleDemandCoun
         lambdaQueryWrapper.eq(VehicleDemandCount::getVdNo, vdNo);
         vehicleDemandCountMapper.delete(lambdaQueryWrapper);
     }
+
+    @Override
+    public List<VehicleDemandCount> getVdCountById(String id) {
+        return vehicleDemandCountMapper.getVdCountById(id);
+    }
 }