货运收发

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

@@ -53,7 +53,7 @@ public class GeneratorCodeByTables {
     }
 
     public static void main(String[] args) throws IOException {
-        generateByTables("Gongdc", "com.yh.saas.plugin.yiliangyiyun","collection_management");
+        generateByTables("Gongdc", "com.yh.saas.plugin.yiliangyiyun","freight_receiving_dispatching_car");
     }
 
     /**

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

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 货运收发车辆 前端控制器
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-19
+ */
+@RestController
+@RequestMapping("/freightReceivingDispatchingCar")
+public class FreightReceivingDispatchingCarController {
+
+}
+

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

@@ -0,0 +1,121 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.DriverViewInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.FreightReceivingDispatching;
+import com.yh.saas.plugin.yiliangyiyun.entity.FreightReceivingDispatchingCar;
+import com.yh.saas.plugin.yiliangyiyun.entity.ReceivingUser;
+import com.yh.saas.plugin.yiliangyiyun.service.IDriverViewInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.IFreightReceivingDispatchingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 货运收发信息 前端控制器
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-19
+ */
+@RestController
+@RequestMapping("/freightReceivingDispatching")
+public class FreightReceivingDispatchingController {
+
+    @Autowired
+    private IFreightReceivingDispatchingService freightReceivingDispatchingService;
+
+    /**
+     * 页面列表
+     *
+     * @param freightReceivingDispatching
+     * @return
+     */
+    @GetMapping("/selectFreightReceivingDispatchingPage")
+    public Page<FreightReceivingDispatching> selectFreightReceivingDispatchingPage(FreightReceivingDispatching freightReceivingDispatching) {
+        return freightReceivingDispatchingService.selectFreightReceivingDispatchingPage(freightReceivingDispatching);
+    }
+
+    /**
+     * 删除信息
+     *
+     * @param freightReceivingDispatching
+     */
+    @PostMapping("/api/deleteFreightReceivingDispatching")
+    public void deleteFreightReceivingDispatching(@RequestBody FreightReceivingDispatching freightReceivingDispatching) {
+        freightReceivingDispatchingService.deleteFreightReceivingDispatching(freightReceivingDispatching.getId());
+    }
+
+    /**
+     * 添加信息
+     *
+     * @param freightReceivingDispatching
+     */
+    @PostMapping("/api/insertFreightReceivingDispatching")
+    public String insertFreightReceivingDispatching(@RequestBody FreightReceivingDispatching freightReceivingDispatching) {
+        return freightReceivingDispatchingService.insertFreightReceivingDispatching(freightReceivingDispatching);
+    }
+
+    /**
+     * 查看详情
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/getFreightReceivingDispatching")
+    public FreightReceivingDispatching getFreightReceivingDispatching(String id) {
+        return freightReceivingDispatchingService.getFreightReceivingDispatching(id);
+    }
+
+    /**
+     * 添加发车信息
+     *
+     * @param freightReceivingDispatchingCar
+     */
+    @PostMapping("/api/insertFreightReceivingDispatching")
+    public String insertFreightReceivingDispatchingCar(@RequestBody FreightReceivingDispatchingCar freightReceivingDispatchingCar) {
+        return freightReceivingDispatchingService.insertFreightReceivingDispatchingCar(freightReceivingDispatchingCar);
+    }
+
+    /**
+     * 付扣运费款
+     *
+     * @param freightReceivingDispatchingCar
+     */
+    @PostMapping("/api/paymentAndDeductionfreight")
+    public String paymentAndDeductionfreight(@RequestBody FreightReceivingDispatchingCar freightReceivingDispatchingCar) {
+        return freightReceivingDispatchingService.paymentAndDeductionfreight(freightReceivingDispatchingCar);
+    }
+
+    /**
+     * 付扣货款
+     *
+     * @param freightReceivingDispatchingCar
+     */
+    @PostMapping("/api/PaymentDeduction")
+    public String PaymentDeduction(@RequestBody FreightReceivingDispatchingCar freightReceivingDispatchingCar) {
+        return freightReceivingDispatchingService.PaymentDeduction(freightReceivingDispatchingCar);
+    }
+
+    /**
+     * 确认收货
+     *
+     * @param freightReceivingDispatchingCar
+     */
+    @PostMapping("/api/confirmFreightReceivingDispatchingCar")
+    public String confirmFreightReceivingDispatchingCar(@RequestBody FreightReceivingDispatchingCar freightReceivingDispatchingCar) {
+        return freightReceivingDispatchingService.confirmFreightReceivingDispatchingCar(freightReceivingDispatchingCar);
+    }
+
+    /**
+     * 确认收货
+     *
+     * @param receivingUser
+     */
+    @PostMapping("/api/insertReceivingUser")
+    public String insertReceivingUser(@RequestBody ReceivingUser receivingUser) {
+        return freightReceivingDispatchingService.insertReceivingUser(receivingUser);
+    }
+}
+

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

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 货运收发收货人 前端控制器
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-19
+ */
+@RestController
+@RequestMapping("/receivingUser")
+public class ReceivingUserController {
+
+}
+

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

@@ -0,0 +1,121 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import java.io.Serializable;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotations.Version;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.yh.saas.common.support.entity.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 货运收发信息
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("freight_receiving_dispatching")
+public class FreightReceivingDispatching extends BaseModel<FreightReceivingDispatching> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 公司id
+     */
+    private String compId;
+    /**
+     * 业务编号
+     */
+    private String businessNumber;
+    /**
+     * 收货方
+     */
+    private String consignee;
+    /**
+     * 发货方
+     */
+    private String shipper;
+    /**
+     * 货名
+     */
+    private String goodsName;
+    /**
+     * 运费承担方
+     */
+    private String freightPayer;
+    /**
+     * 收货地址
+     */
+    private String receivingAddress;
+    /**
+     * 收货人账号
+     */
+    private String accountNumber;
+    /**
+     * 代签收
+     */
+    private String signedFor;
+    /**
+     * 待结算
+     */
+    private String toSettled;
+    /**
+     * 货物单价
+     */
+    private Float goodsPrice;
+    /**
+     * 运费单价（元/吨）
+     */
+    private Float freightUnitPrice;
+    /**
+     * 状态标识
+     */
+    private String statusFlag;
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
+
+    /**
+     * 查询类型
+     */
+    @TableField(exist = false)
+    private String searchType;
+
+    @TableField(exist = false)
+    private List<FreightReceivingDispatchingCar> freightReceivingDispatchingCars;
+
+    @TableField(exist = false)
+    private List<ReceivingUser> receivingUsers;
+
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -0,0 +1,133 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.activerecord.Model;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotations.Version;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yh.saas.common.support.entity.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 货运收发车辆
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("freight_receiving_dispatching_car")
+public class FreightReceivingDispatchingCar extends BaseModel<FreightReceivingDispatchingCar> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 公司id
+     */
+    private String compId;
+    /**
+     * 信息id
+     */
+    private String infoId;
+    /**
+     * 派车编号
+     */
+    private String tranCarNo;
+    /**
+     * 车号
+     */
+    private String carNo;
+    /**
+     * 发货日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date dispatchingDate;
+    /**
+     * 净重发（吨）
+     */
+    private Float reciveNetWeight;
+    /**
+     * 净重收（吨）
+     */
+    private Float dispatchNetWeight;
+    /**
+     * 货款应付金额
+     */
+    private Float goodsIngPayable;
+    /**
+     * 货款已付金额
+     */
+    private Float goodsEdPayable;
+    /**
+     * 运费应付金额
+     */
+    private Float freightIngPayable;
+    /**
+     * 运费已付金额
+     */
+    private Float freightEdPayable;
+    /**
+     * 运费扣款金额
+     */
+    private Float freightDeductionAmount;
+    /**
+     * 货款扣款金额
+     */
+    private Float goodsDeductionAmount;
+    /**
+     * 毛重发（吨）
+     */
+    private Float grossWeight;
+    /**
+     * 皮重发（吨）
+     */
+    private Float tare;
+    /**
+     * 毛重收（吨）
+     */
+    private Float reciveGrossWeight;
+    /**
+     * 皮重收（吨）
+     */
+    private Float reciveTare;
+    /**
+     * 磅单截图发
+     */
+    private String collectionScreenshot;
+    /**
+     * 磅单截图收
+     */
+    private String reciveCollectionScreenshot;
+    /**
+     * 状态标识
+     */
+    private String statusFlag;
+    /**
+     * 状态
+     */
+    private String status;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -0,0 +1,60 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotations.Version;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.yh.saas.common.support.entity.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 货运收发收货人
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("receiving_user")
+public class ReceivingUser extends BaseModel<ReceivingUser> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 公司id
+     */
+    private String compId;
+    /**
+     * 信息id
+     */
+    private String infoId;
+    /**
+     * 收货人姓名
+     */
+    private String receiveName;
+    /**
+     * 收货人电话
+     */
+    private String receivePhone;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/FreightReceivingDispatchingCarMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.FreightReceivingDispatchingCar;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 货运收发车辆 Mapper 接口
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-19
+ */
+public interface FreightReceivingDispatchingCarMapper extends BaseMapper<FreightReceivingDispatchingCar> {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/FreightReceivingDispatchingMapper.java

@@ -0,0 +1,36 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.DriverViewInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.FreightReceivingDispatching;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 货运收发信息 Mapper 接口
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-19
+ */
+public interface FreightReceivingDispatchingMapper extends BaseMapper<FreightReceivingDispatching> {
+
+
+    /**
+     * 根据条件查询总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<FreightReceivingDispatching> getListByCondition(Map<String, Object> pageView);
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/ReceivingUserMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.ReceivingUser;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 货运收发收货人 Mapper 接口
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-19
+ */
+public interface ReceivingUserMapper extends BaseMapper<ReceivingUser> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.FreightReceivingDispatchingCar;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 货运收发车辆 服务类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-19
+ */
+public interface IFreightReceivingDispatchingCarService extends IService<FreightReceivingDispatchingCar> {
+
+}

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

@@ -0,0 +1,88 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.FreightReceivingDispatching;
+import com.baomidou.mybatisplus.service.IService;
+import com.yh.saas.plugin.yiliangyiyun.entity.FreightReceivingDispatchingCar;
+import com.yh.saas.plugin.yiliangyiyun.entity.ReceivingUser;
+
+/**
+ * <p>
+ * 货运收发信息 服务类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-19
+ */
+public interface IFreightReceivingDispatchingService extends IService<FreightReceivingDispatching> {
+
+    /**
+     * 货运收发列表
+     *
+     * @param freightReceivingDispatching
+     * @return
+     */
+    Page<FreightReceivingDispatching> selectFreightReceivingDispatchingPage(FreightReceivingDispatching freightReceivingDispatching);
+
+    /**
+     * 删除信息
+     *
+     * @param id
+     */
+    void deleteFreightReceivingDispatching(String id);
+
+    /**
+     * 添加
+     * @param freightReceivingDispatching
+     * @return
+     */
+    String insertFreightReceivingDispatching(FreightReceivingDispatching freightReceivingDispatching);
+
+
+    /**
+     * 查看详情
+     * @param id
+     * @return
+     */
+    FreightReceivingDispatching getFreightReceivingDispatching(String id);
+
+    /**
+     * 添加发车信息
+     *
+     * @param freightReceivingDispatchingCar
+     * @return
+     */
+    String insertFreightReceivingDispatchingCar(FreightReceivingDispatchingCar freightReceivingDispatchingCar);
+
+    /**
+     * 付扣运费款
+     *
+     * @param freightReceivingDispatchingCar
+     * @return
+     */
+   String paymentAndDeductionfreight(FreightReceivingDispatchingCar freightReceivingDispatchingCar);
+
+    /**
+     * 付扣货款
+     *
+     * @param freightReceivingDispatchingCar
+     * @return
+     */
+   String PaymentDeduction(FreightReceivingDispatchingCar freightReceivingDispatchingCar);
+
+    /**
+     * 确认收货
+     *
+     * @param freightReceivingDispatchingCar
+     * @return
+     */
+   String confirmFreightReceivingDispatchingCar(FreightReceivingDispatchingCar freightReceivingDispatchingCar);
+
+    /**
+     * 添加收货人
+     *
+     * @param receivingUser
+     * @return
+     */
+    String insertReceivingUser(ReceivingUser receivingUser);
+}

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

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.ReceivingUser;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 货运收发收货人 服务类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-19
+ */
+public interface IReceivingUserService extends IService<ReceivingUser> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.FreightReceivingDispatchingCar;
+import com.yh.saas.plugin.yiliangyiyun.mapper.FreightReceivingDispatchingCarMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IFreightReceivingDispatchingCarService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 货运收发车辆 服务实现类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-19
+ */
+@Service
+public class FreightReceivingDispatchingCarServiceImpl extends ServiceImpl<FreightReceivingDispatchingCarMapper, FreightReceivingDispatchingCar> implements IFreightReceivingDispatchingCarService {
+
+}

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

@@ -0,0 +1,239 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.collect.Lists;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
+import com.yh.saas.plugin.yiliangyiyun.mapper.FreightReceivingDispatchingMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.*;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 货运收发信息 服务实现类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-19
+ */
+@Service
+public class FreightReceivingDispatchingServiceImpl extends ServiceImpl<FreightReceivingDispatchingMapper, FreightReceivingDispatching> implements IFreightReceivingDispatchingService {
+
+    @Autowired
+    private IFreightReceivingDispatchingCarService freightReceivingDispatchingCarService;
+    @Autowired
+    private IReceivingUserService receivingUserService;
+
+
+    /**
+     * 货运收发列表
+     *
+     * @param freightReceivingDispatching
+     * @return
+     */
+    @Override
+    public Page<FreightReceivingDispatching> selectFreightReceivingDispatchingPage(FreightReceivingDispatching freightReceivingDispatching) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (freightReceivingDispatching.getCurrentPage() - 1)
+                * freightReceivingDispatching.getPageSize());
+        List<String> idList = new ArrayList<>();
+        List<ReceivingUser> receivingUsers = receivingUserService.selectList(new EntityWrapper<ReceivingUser>()
+                .eq("receive_phone", freightReceivingDispatching.getAccountNumber()));
+        for(ReceivingUser receivingUser : receivingUsers){
+            idList.add(receivingUser.getInfoId());
+        }
+        //公司id
+        pageView.put("compId", freightReceivingDispatching.getCompId());
+        pageView.put("searchType", freightReceivingDispatching.getSearchType());
+        pageView.put("searchKeyWord", freightReceivingDispatching.getSearchKeyWord());
+        pageView.put("accountNumber", freightReceivingDispatching.getAccountNumber());
+        pageView.put("idList", idList);
+        pageView.put("pageSize", freightReceivingDispatching.getPageSize());
+        pageView.put("currentPage", freightReceivingDispatching.getCurrentPage());
+        // 查询总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<FreightReceivingDispatching> dataList = baseMapper.getListByCondition(pageView);
+        Page<FreightReceivingDispatching> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(freightReceivingDispatching.getCurrentPage());
+        page.setSize(freightReceivingDispatching.getPageSize());
+        return page;
+    }
+
+
+    /**
+     * 删除信息
+     *
+     * @param id
+     */
+    @Override
+    public void deleteFreightReceivingDispatching(String id) {
+        //删除司机信息
+        FreightReceivingDispatching freightReceivingDispatching = this.selectById(id);
+        this.deleteById(freightReceivingDispatching.getId());
+        //删除详细信息
+        List<FreightReceivingDispatchingCar> freightReceivingDispatchingCars = freightReceivingDispatchingCarService.selectList(new EntityWrapper<FreightReceivingDispatchingCar>()
+                .eq("info_id", id));
+        if (!CollectionUtils.isEmpty(freightReceivingDispatchingCars)) {
+            for (FreightReceivingDispatchingCar freightReceivingDispatchingCar : freightReceivingDispatchingCars) {
+                freightReceivingDispatchingCarService.deleteById(freightReceivingDispatchingCar.getId());
+            }
+        }
+        //删除收货人信息
+        List<ReceivingUser> receivingUsers = receivingUserService.selectList(new EntityWrapper<ReceivingUser>()
+                .eq("info_id", id));
+        if (!CollectionUtils.isEmpty(receivingUsers)) {
+            for (ReceivingUser receivingUser : receivingUsers) {
+                receivingUserService.deleteById(receivingUser.getId());
+            }
+        }
+    }
+
+    /**
+     * 添加
+     *
+     * @param freightReceivingDispatching
+     * @return
+     */
+    @Override
+    public String insertFreightReceivingDispatching(FreightReceivingDispatching freightReceivingDispatching) {
+        freightReceivingDispatching.setId(IdGenerator.generateUUID());
+        freightReceivingDispatching.setStatusFlag("1");
+        freightReceivingDispatching.setStatus("发货");
+        this.insert(freightReceivingDispatching);
+        return freightReceivingDispatching.getId();
+    }
+
+
+    /**
+     * 添加发车信息
+     *
+     * @param freightReceivingDispatchingCar
+     * @return
+     */
+    @Override
+    public String insertFreightReceivingDispatchingCar(FreightReceivingDispatchingCar freightReceivingDispatchingCar) {
+        freightReceivingDispatchingCar.setId(IdGenerator.generateUUID());
+        freightReceivingDispatchingCar.setStatusFlag("1");
+        freightReceivingDispatchingCar.setStatus("待签收");
+        freightReceivingDispatchingCarService.insert(freightReceivingDispatchingCar);
+        FreightReceivingDispatching freightReceivingDispatching = this.selectById(freightReceivingDispatchingCar.getInfoId());
+        if (freightReceivingDispatching != null) {
+            freightReceivingDispatching.setSignedFor(String.valueOf(Integer.valueOf(freightReceivingDispatching.getSignedFor()) + 1));
+            this.updateById(freightReceivingDispatching);
+        }
+
+        return freightReceivingDispatchingCar.getInfoId();
+    }
+
+
+    /**
+     * 付扣运费款
+     *
+     * @param freightReceivingDispatchingCar
+     * @return
+     */
+    @Override
+    public String paymentAndDeductionfreight(FreightReceivingDispatchingCar freightReceivingDispatchingCar) {
+        FreightReceivingDispatchingCar freightReceivingDispatchingCar1 = freightReceivingDispatchingCarService.selectById(freightReceivingDispatchingCar.getId());
+        freightReceivingDispatchingCar1.setFreightIngPayable(freightReceivingDispatchingCar.getFreightIngPayable());
+        // 付款金额 用已付这个字段  然后累加
+        freightReceivingDispatchingCar1.setFreightEdPayable(freightReceivingDispatchingCar1.getFreightEdPayable() + freightReceivingDispatchingCar.getFreightEdPayable());
+        freightReceivingDispatchingCar1.setFreightDeductionAmount(freightReceivingDispatchingCar.getFreightDeductionAmount());
+        freightReceivingDispatchingCarService.updateById(freightReceivingDispatchingCar1);
+        return freightReceivingDispatchingCar.getInfoId();
+    }
+
+
+    /**
+     * 付扣货款
+     *
+     * @param freightReceivingDispatchingCar
+     * @return
+     */
+    @Override
+    public String PaymentDeduction(FreightReceivingDispatchingCar freightReceivingDispatchingCar) {
+        FreightReceivingDispatchingCar freightReceivingDispatchingCar1 = freightReceivingDispatchingCarService.selectById(freightReceivingDispatchingCar.getId());
+        freightReceivingDispatchingCar1.setGoodsIngPayable(freightReceivingDispatchingCar.getGoodsIngPayable());
+        // 付款金额 用已付这个字段  然后累加
+        freightReceivingDispatchingCar1.setFreightEdPayable(freightReceivingDispatchingCar1.getFreightEdPayable() + freightReceivingDispatchingCar.getFreightEdPayable());
+        freightReceivingDispatchingCar1.setGoodsDeductionAmount(freightReceivingDispatchingCar.getGoodsDeductionAmount());
+        if (freightReceivingDispatchingCar1.getGoodsIngPayable() == freightReceivingDispatchingCar1.getGoodsEdPayable()) {
+            freightReceivingDispatchingCar1.setStatusFlag("5");
+            freightReceivingDispatchingCar1.setStatus("已完成");
+        }
+        FreightReceivingDispatching freightReceivingDispatching = this.selectById(freightReceivingDispatchingCar.getInfoId());
+        if (freightReceivingDispatching != null) {
+            freightReceivingDispatching.setToSettled(String.valueOf(Integer.valueOf(freightReceivingDispatching.getToSettled()) - 1));
+            this.updateById(freightReceivingDispatching);
+        }
+        freightReceivingDispatchingCarService.updateById(freightReceivingDispatchingCar1);
+        return freightReceivingDispatchingCar.getInfoId();
+    }
+
+    /**
+     * 确认收货
+     *
+     * @param freightReceivingDispatchingCar
+     * @return
+     */
+    @Override
+    public String confirmFreightReceivingDispatchingCar(FreightReceivingDispatchingCar freightReceivingDispatchingCar) {
+        freightReceivingDispatchingCar.setId(IdGenerator.generateUUID());
+        freightReceivingDispatchingCar.setStatusFlag("3");
+        freightReceivingDispatchingCar.setStatus("待结算");
+        freightReceivingDispatchingCarService.insert(freightReceivingDispatchingCar);
+        FreightReceivingDispatching freightReceivingDispatching = this.selectById(freightReceivingDispatchingCar.getInfoId());
+        if (freightReceivingDispatching != null) {
+            freightReceivingDispatching.setToSettled(String.valueOf(Integer.valueOf(freightReceivingDispatching.getToSettled()) + 1));
+            freightReceivingDispatching.setStatusFlag("2");
+            freightReceivingDispatching.setStatus("收货");
+            this.updateById(freightReceivingDispatching);
+        }
+
+        return freightReceivingDispatchingCar.getInfoId();
+    }
+
+    /**
+     * 添加收货人
+     *
+     * @param receivingUser
+     * @return
+     */
+    @Override
+    public String insertReceivingUser(ReceivingUser receivingUser) {
+        receivingUser.setId(IdGenerator.generateUUID());
+        receivingUserService.insert(receivingUser);
+        return receivingUser.getInfoId();
+    }
+
+
+    /**
+     * 查看详情
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public FreightReceivingDispatching getFreightReceivingDispatching(String id) {
+        //查看信息
+        FreightReceivingDispatching freightReceivingDispatching = this.selectById(id);
+        // 查看详情
+        List<FreightReceivingDispatchingCar> freightReceivingDispatchingCars = freightReceivingDispatchingCarService.selectList(new EntityWrapper<FreightReceivingDispatchingCar>()
+                .eq("info_id", id));
+        freightReceivingDispatching.setFreightReceivingDispatchingCars(freightReceivingDispatchingCars);
+        return freightReceivingDispatching;
+    }
+}
+

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

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.ReceivingUser;
+import com.yh.saas.plugin.yiliangyiyun.mapper.ReceivingUserMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IReceivingUserService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 货运收发收货人 服务实现类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-19
+ */
+@Service
+public class ReceivingUserServiceImpl extends ServiceImpl<ReceivingUserMapper, ReceivingUser> implements IReceivingUserService {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/FreightReceivingDispatchingCarMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.FreightReceivingDispatchingCarMapper">
+
+</mapper>

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/FreightReceivingDispatchingMapper.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.FreightReceivingDispatchingMapper">
+
+
+    <!-- 获得总数 -->
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        select
+        count(1)
+        from(
+        SELECT
+        id
+        FROM freight_receiving_dispatching
+        WHERE
+        delete_flag = '0'
+        <if test="accountNumber != null and accountNumber != ''">
+            AND account_number = #{accountNumber}
+        </if>
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND signed_for != null and signed_for != '' and signed_for != '0'
+            </if>
+            <if test="searchType == 2">
+                AND to_settled != null and to_settled != '' and to_settled != '0'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(business_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(consignee) like lower(CONCAT('%',#{searchKeyWord},'%'))
+        </if>
+        <if test="idList != null and idList.size > 0">
+            <foreach collection="idList" item="bill"
+                     open="or (" close=")" separator="or">
+                id = #{bill}
+            </foreach>
+        </if>
+        ) t
+
+    </select>
+    <!-- 司机列表查询 -->
+    <select id="getListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.FreightReceivingDispatching">
+        SELECT
+        id,
+        comp_id as compId,
+        consignee,
+        business_number as businessNumber,
+        shipper as driverPhone,
+        goods_name as goodsName,
+        freight_payer as freightPayer,
+        receiving_address as receivingAddress,
+        account_number as accountNumber,
+        goods_price as goodsPrice,
+        freight_unit_price as freightUnitPrice,
+        status_flag as statusFlag,
+        status as status,
+        FROM freight_receiving_dispatching
+        WHERE
+        delete_flag = '0'
+        <if test="accountNumber != null and accountNumber != ''">
+            AND account_number = #{accountNumber}
+        </if>
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND signed_for != null and signed_for != '' and signed_for != '0'
+            </if>
+            <if test="searchType == 2">
+                AND to_settled != null and to_settled != '' and to_settled != '0'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(business_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(consignee) like lower(CONCAT('%',#{searchKeyWord},'%'))
+        </if>
+        <if test="idList != null and idList.size > 0">
+            <foreach collection="idList" item="bill"
+                     open="or (" close=")" separator="or">
+                id = #{bill}
+            </foreach>
+        </if>
+        ORDER BY update_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
+</mapper>

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ReceivingUserMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.ReceivingUserMapper">
+
+</mapper>