装箱出货

hx-account/src/main/java/com/fjhx/account/entity/account/dto/AccountRunningWaterSelectDto.java

@@ -32,4 +32,14 @@ public class AccountRunningWaterSelectDto extends BaseSelectDto {
      * 模糊查询时使用
      */
     private String keyword;
+
+    /**
+     * 数据类型 1:到账认领
+     */
+    private Integer dataType;
+
+    /**
+     * 是否认领
+     */
+    private String isClaim;
 }

hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountRunningWater.java

@@ -75,4 +75,8 @@ public class AccountRunningWater extends BasePo {
      */
     private String remarks;
 
+    /**
+     * 是否认领
+     */
+    private Integer isClaim;
 }

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -34,9 +34,14 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getAccountManagementId()), "arw.account_management_id", dto.getAccountManagementId());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()), "arw.status", dto.getStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getCurrency()), "arw.currency", dto.getCurrency());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getIsClaim()), "arw.is_claim", dto.getIsClaim());
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.and(wrapper1 -> wrapper1.like("arw.remarks", dto.getKeyword()).or().like("arw.name", dto.getKeyword()));
         }
+        if(ObjectUtil.isNotEmpty(dto.getDataType())&&dto.getDataType()==1){//到账认领数据
+            wrapper.eq("arw.received",10);
+            wrapper.orderByDesc("arw.is_claim","arw.create_time");
+        }
         Page<AccountRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }

hx-account/src/main/resources/mapper/account/AccountRunningWaterMapper.xml

@@ -3,22 +3,7 @@
 <mapper namespace="com.fjhx.account.mapper.account.AccountRunningWaterMapper">
     <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountRunningWaterVo">
         select
-            arw.id,
-            arw.account_management_id,
-            arw.status,
-            arw.business_id,
-            arw.amount,
-            arw.currency,
-            arw.name,
-            arw.received,
-            arw.opening_bank,
-            arw.account_opening,
-            arw.transaction_time,
-            arw.remarks,
-            arw.create_user,
-            arw.create_time,
-            arw.update_user,
-            arw.update_time,
+            arw.*,
             am.alias accountManagementName
         from account_running_water arw
                  left join  account_management am on arw.account_management_id = am.id

hx-sale/pom.xml

@@ -27,6 +27,12 @@
             <groupId>com.fjhx</groupId>
             <artifactId>hx-customer</artifactId>
         </dependency>
+
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-account</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

hx-sale/src/main/java/com/fjhx/sale/controller/claim/ClaimContractController.java

@@ -0,0 +1,68 @@
+package com.fjhx.sale.controller.claim;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
+import com.fjhx.sale.entity.claim.dto.ClaimContractSelectDto;
+import com.fjhx.sale.entity.claim.dto.ClaimContractDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.service.claim.ClaimContractService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 到账认领-合同关联表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@RestController
+@RequestMapping("/claimContract")
+public class ClaimContractController {
+
+    @Autowired
+    private ClaimContractService claimContractService;
+
+    /**
+     * 到账认领-合同关联表分页
+     */
+    @PostMapping("/page")
+    public Page<ClaimContractVo> page(@RequestBody ClaimContractSelectDto dto) {
+        return claimContractService.getPage(dto);
+    }
+
+    /**
+     * 到账认领-合同关联表明细
+     */
+    @PostMapping("/detail")
+    public ClaimContractVo detail(@RequestBody BaseSelectDto dto) {
+        return claimContractService.detail(dto.getId());
+    }
+
+    /**
+     * 到账认领-合同关联表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody ClaimContractDto claimContractDto) {
+        claimContractService.add(claimContractDto);
+    }
+
+    /**
+     * 到账认领-合同关联表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody ClaimContractDto claimContractDto) {
+        claimContractService.edit(claimContractDto);
+    }
+
+    /**
+     * 到账认领-合同关联表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        claimContractService.delete(dto.getId());
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/controller/claim/ClaimController.java

@@ -0,0 +1,69 @@
+package com.fjhx.sale.controller.claim;
+
+import com.fjhx.sale.entity.claim.po.Claim;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.claim.vo.ClaimVo;
+import com.fjhx.sale.entity.claim.dto.ClaimSelectDto;
+import com.fjhx.sale.entity.claim.dto.ClaimDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.service.claim.ClaimService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 到账认领 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@RestController
+@RequestMapping("/claim")
+public class ClaimController {
+
+    @Autowired
+    private ClaimService claimService;
+
+    /**
+     * 到账认领分页
+     */
+    @PostMapping("/page")
+    public Page<ClaimVo> page(@RequestBody ClaimSelectDto dto) {
+        return claimService.getPage(dto);
+    }
+
+    /**
+     * 到账认领明细
+     */
+    @PostMapping("/detail")
+    public ClaimVo detail(@RequestBody BaseSelectDto dto) {
+        return claimService.detail(dto.getId());
+    }
+
+    /**
+     * 到账认领新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody Claim claim) {
+        claimService.add(claim);
+    }
+
+    /**
+     * 到账认领编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody ClaimDto claimDto) {
+        claimService.edit(claimDto);
+    }
+
+    /**
+     * 到账认领删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        claimService.delete(dto.getId());
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/controller/pack/PackController.java

@@ -0,0 +1,68 @@
+package com.fjhx.sale.controller.pack;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackVo;
+import com.fjhx.sale.entity.pack.dto.PackSelectDto;
+import com.fjhx.sale.entity.pack.dto.PackDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.service.pack.PackService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 装箱出货表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@RestController
+@RequestMapping("/pack")
+public class PackController {
+
+    @Autowired
+    private PackService packService;
+
+    /**
+     * 装箱出货表分页
+     */
+    @PostMapping("/page")
+    public Page<PackVo> page(@RequestBody PackSelectDto dto) {
+        return packService.getPage(dto);
+    }
+
+    /**
+     * 装箱出货表明细
+     */
+    @PostMapping("/detail")
+    public PackVo detail(@RequestBody BaseSelectDto dto) {
+        return packService.detail(dto.getId());
+    }
+
+    /**
+     * 装箱出货表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody PackDto packDto) {
+        packService.add(packDto);
+    }
+
+    /**
+     * 装箱出货表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody PackDto packDto) {
+        packService.edit(packDto);
+    }
+
+    /**
+     * 装箱出货表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        packService.delete(dto.getId());
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/controller/pack/PackDetailController.java

@@ -0,0 +1,68 @@
+package com.fjhx.sale.controller.pack;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackDetailVo;
+import com.fjhx.sale.entity.pack.dto.PackDetailSelectDto;
+import com.fjhx.sale.entity.pack.dto.PackDetailDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.service.pack.PackDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 装箱出货明细表	 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@RestController
+@RequestMapping("/packDetail")
+public class PackDetailController {
+
+    @Autowired
+    private PackDetailService packDetailService;
+
+    /**
+     * 装箱出货明细表	分页
+     */
+    @PostMapping("/page")
+    public Page<PackDetailVo> page(@RequestBody PackDetailSelectDto dto) {
+        return packDetailService.getPage(dto);
+    }
+
+    /**
+     * 装箱出货明细表	明细
+     */
+    @PostMapping("/detail")
+    public PackDetailVo detail(@RequestBody BaseSelectDto dto) {
+        return packDetailService.detail(dto.getId());
+    }
+
+    /**
+     * 装箱出货明细表	新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody PackDetailDto packDetailDto) {
+        packDetailService.add(packDetailDto);
+    }
+
+    /**
+     * 装箱出货明细表	编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody PackDetailDto packDetailDto) {
+        packDetailService.edit(packDetailDto);
+    }
+
+    /**
+     * 装箱出货明细表	删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        packDetailService.delete(dto.getId());
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/controller/pack/PackDetailGoodsController.java

@@ -0,0 +1,68 @@
+package com.fjhx.sale.controller.pack;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackDetailGoodsVo;
+import com.fjhx.sale.entity.pack.dto.PackDetailGoodsSelectDto;
+import com.fjhx.sale.entity.pack.dto.PackDetailGoodsDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.service.pack.PackDetailGoodsService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 自定义装箱货物表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@RestController
+@RequestMapping("/packDetailGoods")
+public class PackDetailGoodsController {
+
+    @Autowired
+    private PackDetailGoodsService packDetailGoodsService;
+
+    /**
+     * 自定义装箱货物表分页
+     */
+    @PostMapping("/page")
+    public Page<PackDetailGoodsVo> page(@RequestBody PackDetailGoodsSelectDto dto) {
+        return packDetailGoodsService.getPage(dto);
+    }
+
+    /**
+     * 自定义装箱货物表明细
+     */
+    @PostMapping("/detail")
+    public PackDetailGoodsVo detail(@RequestBody BaseSelectDto dto) {
+        return packDetailGoodsService.detail(dto.getId());
+    }
+
+    /**
+     * 自定义装箱货物表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody PackDetailGoodsDto packDetailGoodsDto) {
+        packDetailGoodsService.add(packDetailGoodsDto);
+    }
+
+    /**
+     * 自定义装箱货物表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody PackDetailGoodsDto packDetailGoodsDto) {
+        packDetailGoodsService.edit(packDetailGoodsDto);
+    }
+
+    /**
+     * 自定义装箱货物表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        packDetailGoodsService.delete(dto.getId());
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/controller/pack/PackProductProductController.java

@@ -0,0 +1,68 @@
+package com.fjhx.sale.controller.pack;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackProductProductVo;
+import com.fjhx.sale.entity.pack.dto.PackProductProductSelectDto;
+import com.fjhx.sale.entity.pack.dto.PackProductProductDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.service.pack.PackProductProductService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 装箱出货产品明细表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@RestController
+@RequestMapping("/packProductProduct")
+public class PackProductProductController {
+
+    @Autowired
+    private PackProductProductService packProductProductService;
+
+    /**
+     * 装箱出货产品明细表分页
+     */
+    @PostMapping("/page")
+    public Page<PackProductProductVo> page(@RequestBody PackProductProductSelectDto dto) {
+        return packProductProductService.getPage(dto);
+    }
+
+    /**
+     * 装箱出货产品明细表明细
+     */
+    @PostMapping("/detail")
+    public PackProductProductVo detail(@RequestBody BaseSelectDto dto) {
+        return packProductProductService.detail(dto.getId());
+    }
+
+    /**
+     * 装箱出货产品明细表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody PackProductProductDto packProductProductDto) {
+        packProductProductService.add(packProductProductDto);
+    }
+
+    /**
+     * 装箱出货产品明细表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody PackProductProductDto packProductProductDto) {
+        packProductProductService.edit(packProductProductDto);
+    }
+
+    /**
+     * 装箱出货产品明细表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        packProductProductService.delete(dto.getId());
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/claim/dto/ClaimContractDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.claim.dto;
+
+import com.fjhx.sale.entity.claim.po.ClaimContract;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 到账认领-合同关联表新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class ClaimContractDto extends ClaimContract {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/claim/dto/ClaimContractSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.claim.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 到账认领-合同关联表列表查询入参实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class ClaimContractSelectDto extends BaseSelectDto {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/claim/dto/ClaimDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.claim.dto;
+
+import com.fjhx.sale.entity.claim.po.Claim;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 到账认领新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class ClaimDto extends Claim {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/claim/dto/ClaimSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.claim.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 到账认领列表查询入参实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class ClaimSelectDto extends BaseSelectDto {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/claim/po/Claim.java

@@ -0,0 +1,79 @@
+package com.fjhx.sale.entity.claim.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fjhx.file.entity.FileInfo;
+import com.fjhx.file.entity.ObsFile;
+import com.ruoyi.common.core.domain.BasePo;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 到账认领
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+@TableName("claim")
+public class Claim extends BasePo {
+
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 账户ID
+     */
+    private Long accountManagementId;
+
+    /**
+     * 币种（字典account_currency）
+     */
+    private String currency;
+
+    /**
+     * 业务ID
+     */
+    private Long businessId;
+
+    /**
+     * 认领人ID
+     */
+    private Long claimUserId;
+
+    /**
+     * 认领人名称
+     */
+    private String claimUserName;
+
+    /**
+     * 认领时间
+     */
+    private Date claimTime;
+
+    /**
+     * 到账认领合同列表
+     */
+    @TableField(exist = false)
+    private List<ClaimContract> claimContractList;
+
+    /**
+     * 附件列表
+     */
+    @TableField(exist = false)
+    private List<ObsFile> fileList;
+}

hx-sale/src/main/java/com/fjhx/sale/entity/claim/po/ClaimContract.java

@@ -0,0 +1,42 @@
+package com.fjhx.sale.entity.claim.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 到账认领-合同关联表
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+@TableName("claim_contract")
+public class ClaimContract extends BasePo {
+
+    /**
+     * 合同ID
+     */
+    private Long contractId;
+
+    /**
+     * 到账认领ID
+     */
+    private Long claimId;
+    /**
+     * 关联金额
+     */
+    private BigDecimal money;
+
+    /**
+     * 合同编码
+     */
+    private String contractCode;
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/claim/vo/ClaimContractVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.claim.vo;
+
+import com.fjhx.sale.entity.claim.po.ClaimContract;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 到账认领-合同关联表列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class ClaimContractVo extends ClaimContract {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/claim/vo/ClaimVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.claim.vo;
+
+import com.fjhx.sale.entity.claim.po.Claim;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 到账认领列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class ClaimVo extends Claim {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/dto/PackDetailDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.pack.dto;
+
+import com.fjhx.sale.entity.pack.po.PackDetail;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 装箱出货明细表	新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class PackDetailDto extends PackDetail {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/dto/PackDetailGoodsDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.pack.dto;
+
+import com.fjhx.sale.entity.pack.po.PackDetailGoods;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 自定义装箱货物表新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class PackDetailGoodsDto extends PackDetailGoods {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/dto/PackDetailGoodsSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.pack.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 自定义装箱货物表列表查询入参实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class PackDetailGoodsSelectDto extends BaseSelectDto {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/dto/PackDetailSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.pack.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 装箱出货明细表	列表查询入参实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class PackDetailSelectDto extends BaseSelectDto {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/dto/PackDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.pack.dto;
+
+import com.fjhx.sale.entity.pack.po.Pack;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 装箱出货表新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class PackDto extends Pack {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/dto/PackProductProductDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.pack.dto;
+
+import com.fjhx.sale.entity.pack.po.PackProductProduct;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 装箱出货产品明细表新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class PackProductProductDto extends PackProductProduct {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/dto/PackProductProductSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.pack.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 装箱出货产品明细表列表查询入参实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class PackProductProductSelectDto extends BaseSelectDto {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/dto/PackSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.pack.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 装箱出货表列表查询入参实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class PackSelectDto extends BaseSelectDto {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/po/Pack.java

@@ -0,0 +1,47 @@
+package com.fjhx.sale.entity.pack.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 装箱出货表
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+@TableName("pack")
+public class Pack extends BasePo {
+
+    /**
+     * 装箱单号
+     */
+    private String code;
+
+    /**
+     * 客户ID
+     */
+    private Long customerId;
+
+    /**
+     * 合同ID
+     */
+    private Long contractId;
+
+    /**
+     * 合同编码
+     */
+    private String contractCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/po/PackDetail.java

@@ -0,0 +1,103 @@
+package com.fjhx.sale.entity.pack.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 装箱出货明细表	
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+@TableName("pack_detail")
+public class PackDetail extends BasePo {
+
+    /**
+     * 装箱单ID
+     */
+    private Long packId;
+
+    /**
+     * 客户ID
+     */
+    private Long customerId;
+
+    /**
+     * 合同ID
+     */
+    private Long contractId;
+
+    /**
+     * 合同编码
+     */
+    private String contractCode;
+
+    /**
+     * 箱数
+     */
+    private BigDecimal packQuantity;
+
+    /**
+     * 净重 KG
+     */
+    private BigDecimal netWeight;
+
+    /**
+     * 毛重 KG
+     */
+    private BigDecimal roughWeight;
+
+    /**
+     * 长 cm
+     */
+    private BigDecimal boxLong;
+
+    /**
+     * 宽 cm
+     */
+    private BigDecimal boxWide;
+
+    /**
+     * 高 cm
+     */
+    private BigDecimal boxHigh;
+
+    /**
+     * 体积
+     */
+    private BigDecimal bomVolume;
+
+    /**
+     * 出货时间
+     */
+    private Date shipmentTime;
+
+    /**
+     * 出货状态 0未出货 1出货
+     */
+    private Integer shipmentStatus;
+
+    /**
+     * 运单号
+     */
+    private String waybillCode;
+
+    /**
+     * 快递ID
+     */
+    private Long expressId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/po/PackDetailGoods.java

@@ -0,0 +1,43 @@
+package com.fjhx.sale.entity.pack.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 自定义装箱货物表
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+@TableName("pack_detail_goods")
+public class PackDetailGoods extends BasePo {
+
+    /**
+     * 装箱单ID
+     */
+    private Long packDetailId;
+
+    /**
+     * 装箱数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/po/PackProductProduct.java

@@ -0,0 +1,68 @@
+package com.fjhx.sale.entity.pack.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 装箱出货产品明细表
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+@TableName("pack_product_product")
+public class PackProductProduct extends BasePo {
+
+    /**
+     * 装箱单编码
+     */
+    private String code;
+
+    /**
+     * 装箱明细ID
+     */
+    private Long packDetailId;
+
+    /**
+     * 合同ID
+     */
+    private Long contractId;
+
+    /**
+     * 合同产品ID
+     */
+    private String contractProductId;
+
+    /**
+     * 装箱数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 产品ID
+     */
+    private Long productId;
+
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+    /**
+     * 产品规格型号
+     */
+    private String productModel;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/vo/PackDetailGoodsVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.pack.vo;
+
+import com.fjhx.sale.entity.pack.po.PackDetailGoods;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 自定义装箱货物表列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class PackDetailGoodsVo extends PackDetailGoods {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/vo/PackDetailVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.pack.vo;
+
+import com.fjhx.sale.entity.pack.po.PackDetail;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 装箱出货明细表	列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class PackDetailVo extends PackDetail {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/vo/PackProductProductVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.pack.vo;
+
+import com.fjhx.sale.entity.pack.po.PackProductProduct;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 装箱出货产品明细表列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class PackProductProductVo extends PackProductProduct {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/vo/PackVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.pack.vo;
+
+import com.fjhx.sale.entity.pack.po.Pack;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 装箱出货表列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Getter
+@Setter
+public class PackVo extends Pack {
+
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/claim/ClaimContractMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.sale.mapper.claim;
+
+import com.fjhx.sale.entity.claim.po.ClaimContract;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 到账认领-合同关联表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+public interface ClaimContractMapper extends BaseMapper<ClaimContract> {
+
+    /**
+     * 到账认领-合同关联表分页
+     */
+    Page<ClaimContractVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ClaimContract> wrapper);
+
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/claim/ClaimMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.sale.mapper.claim;
+
+import com.fjhx.sale.entity.claim.po.Claim;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.claim.vo.ClaimVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 到账认领 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+public interface ClaimMapper extends BaseMapper<Claim> {
+
+    /**
+     * 到账认领分页
+     */
+    Page<ClaimVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Claim> wrapper);
+
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/pack/PackDetailGoodsMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.sale.mapper.pack;
+
+import com.fjhx.sale.entity.pack.po.PackDetailGoods;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackDetailGoodsVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 自定义装箱货物表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+public interface PackDetailGoodsMapper extends BaseMapper<PackDetailGoods> {
+
+    /**
+     * 自定义装箱货物表分页
+     */
+    Page<PackDetailGoodsVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<PackDetailGoods> wrapper);
+
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/pack/PackDetailMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.sale.mapper.pack;
+
+import com.fjhx.sale.entity.pack.po.PackDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackDetailVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 装箱出货明细表	 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+public interface PackDetailMapper extends BaseMapper<PackDetail> {
+
+    /**
+     * 装箱出货明细表	分页
+     */
+    Page<PackDetailVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<PackDetail> wrapper);
+
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/pack/PackMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.sale.mapper.pack;
+
+import com.fjhx.sale.entity.pack.po.Pack;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 装箱出货表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+public interface PackMapper extends BaseMapper<Pack> {
+
+    /**
+     * 装箱出货表分页
+     */
+    Page<PackVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Pack> wrapper);
+
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/pack/PackProductProductMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.sale.mapper.pack;
+
+import com.fjhx.sale.entity.pack.po.PackProductProduct;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackProductProductVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 装箱出货产品明细表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+public interface PackProductProductMapper extends BaseMapper<PackProductProduct> {
+
+    /**
+     * 装箱出货产品明细表分页
+     */
+    Page<PackProductProductVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<PackProductProduct> wrapper);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/claim/ClaimContractService.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.service.claim;
+
+import com.fjhx.sale.entity.claim.po.ClaimContract;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
+import com.fjhx.sale.entity.claim.dto.ClaimContractSelectDto;
+import com.fjhx.sale.entity.claim.dto.ClaimContractDto;
+
+
+/**
+ * <p>
+ * 到账认领-合同关联表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+public interface ClaimContractService extends BaseService<ClaimContract> {
+
+    /**
+     * 到账认领-合同关联表分页
+     */
+    Page<ClaimContractVo> getPage(ClaimContractSelectDto dto);
+
+    /**
+     * 到账认领-合同关联表明细
+     */
+    ClaimContractVo detail(Long id);
+
+    /**
+     * 到账认领-合同关联表新增
+     */
+    void add(ClaimContractDto claimContractDto);
+
+    /**
+     * 到账认领-合同关联表编辑
+     */
+    void edit(ClaimContractDto claimContractDto);
+
+    /**
+     * 到账认领-合同关联表删除
+     */
+    void delete(Long id);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/claim/ClaimService.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.service.claim;
+
+import com.fjhx.sale.entity.claim.po.Claim;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.claim.vo.ClaimVo;
+import com.fjhx.sale.entity.claim.dto.ClaimSelectDto;
+import com.fjhx.sale.entity.claim.dto.ClaimDto;
+
+
+/**
+ * <p>
+ * 到账认领 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+public interface ClaimService extends BaseService<Claim> {
+
+    /**
+     * 到账认领分页
+     */
+    Page<ClaimVo> getPage(ClaimSelectDto dto);
+
+    /**
+     * 到账认领明细
+     */
+    ClaimVo detail(Long id);
+
+    /**
+     * 到账认领新增
+     */
+    void add(Claim claim);
+
+    /**
+     * 到账认领编辑
+     */
+    void edit(ClaimDto claimDto);
+
+    /**
+     * 到账认领删除
+     */
+    void delete(Long id);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimContractServiceImpl.java

@@ -0,0 +1,57 @@
+package com.fjhx.sale.service.claim.impl;
+
+import com.fjhx.sale.entity.claim.po.ClaimContract;
+import com.fjhx.sale.mapper.claim.ClaimContractMapper;
+import com.fjhx.sale.service.claim.ClaimContractService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
+import com.fjhx.sale.entity.claim.dto.ClaimContractSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.sale.entity.claim.dto.ClaimContractDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 到账认领-合同关联表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Service
+public class ClaimContractServiceImpl extends ServiceImpl<ClaimContractMapper, ClaimContract> implements ClaimContractService {
+
+    @Override
+    public Page<ClaimContractVo> getPage(ClaimContractSelectDto dto) {
+        IWrapper<ClaimContract> wrapper = getWrapper();
+        wrapper.orderByDesc("cc", ClaimContract::getId);
+        Page<ClaimContractVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public ClaimContractVo detail(Long id) {
+        ClaimContract ClaimContract = this.getById(id);
+        ClaimContractVo result = BeanUtil.toBean(ClaimContract, ClaimContractVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(ClaimContractDto claimContractDto) {
+        this.save(claimContractDto);
+    }
+
+    @Override
+    public void edit(ClaimContractDto claimContractDto) {
+        this.updateById(claimContractDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimServiceImpl.java

@@ -0,0 +1,114 @@
+package com.fjhx.sale.service.claim.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.account.entity.account.po.AccountRunningWater;
+import com.fjhx.account.service.account.AccountRunningWaterService;
+import com.fjhx.file.utils.ObsFileUtil;
+import com.fjhx.sale.entity.claim.po.Claim;
+import com.fjhx.sale.entity.claim.po.ClaimContract;
+import com.fjhx.sale.mapper.claim.ClaimMapper;
+import com.fjhx.sale.service.claim.ClaimContractService;
+import com.fjhx.sale.service.claim.ClaimService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.obs.services.internal.ServiceException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.claim.vo.ClaimVo;
+import com.fjhx.sale.entity.claim.dto.ClaimSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.sale.entity.claim.dto.ClaimDto;
+import cn.hutool.core.bean.BeanUtil;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 到账认领 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Service
+public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements ClaimService {
+
+    @Autowired
+    private ClaimContractService claimContractService;
+
+
+    @Autowired
+    private AccountRunningWaterService accountRunningWaterService;
+
+    @Override
+    public Page<ClaimVo> getPage(ClaimSelectDto dto) {
+        IWrapper<Claim> wrapper = getWrapper();
+        wrapper.orderByDesc("c", Claim::getId);
+        Page<ClaimVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public ClaimVo detail(Long id) {
+        Claim Claim = this.getById(id);
+        ClaimVo result = BeanUtil.toBean(Claim, ClaimVo.class);
+        return result;
+    }
+
+    /**
+     * 添加
+     * @param claim
+     */
+    @Override
+    @DSTransactional
+    public void add(Claim claim) {
+        Claim data = this.getOne(Wrappers.<Claim>query().lambda().eq(Claim::getBusinessId,claim.getBusinessId()));
+        if(ObjectUtils.isNotEmpty(data)){
+            throw new ServiceException("当前这笔资金已被认领");
+        }
+        this.save(claim);
+        List<ClaimContract> claimContractList = claim.getClaimContractList();
+        if(CollectionUtils.isNotEmpty(claim.getClaimContractList())){
+            for(ClaimContract c:claimContractList){
+                c.setClaimId(claim.getId());
+            }
+            claimContractService.saveBatch(claimContractList);
+        }
+        //更新流水数据为认领状态
+        AccountRunningWater water = new AccountRunningWater();
+        water.setId(claim.getBusinessId());
+        water.setIsClaim(1);//已认领状态
+        accountRunningWaterService.updateById(water);
+        ObsFileUtil.saveFile(claim.getFileList(),claim.getId());
+    }
+
+    @Override
+    public void edit(ClaimDto claimDto) {
+        this.updateById(claimDto);
+    }
+
+    /**
+     * 删除
+     * @param id 流水ID
+     */
+    @Override
+    @DSTransactional
+    public void delete(Long id) {
+        Claim claim = this.getOne(Wrappers.<Claim>query().lambda().eq(Claim::getBusinessId,id));
+        if(ObjectUtils.isNotEmpty(claim.getBusinessId())){
+            //更新流水数据为认领状态
+            AccountRunningWater water = new AccountRunningWater();
+            water.setId(claim.getBusinessId());
+            water.setIsClaim(0);//未认领状态
+            accountRunningWaterService.updateById(water);
+        }
+        this.removeById(Wrappers.<Claim>query().lambda().eq(Claim::getBusinessId,id));
+        claimContractService.remove(Wrappers.<ClaimContract>query().lambda().eq(ClaimContract::getClaimId,claim.getId()));
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/pack/PackDetailGoodsService.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.service.pack;
+
+import com.fjhx.sale.entity.pack.po.PackDetailGoods;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackDetailGoodsVo;
+import com.fjhx.sale.entity.pack.dto.PackDetailGoodsSelectDto;
+import com.fjhx.sale.entity.pack.dto.PackDetailGoodsDto;
+
+
+/**
+ * <p>
+ * 自定义装箱货物表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+public interface PackDetailGoodsService extends BaseService<PackDetailGoods> {
+
+    /**
+     * 自定义装箱货物表分页
+     */
+    Page<PackDetailGoodsVo> getPage(PackDetailGoodsSelectDto dto);
+
+    /**
+     * 自定义装箱货物表明细
+     */
+    PackDetailGoodsVo detail(Long id);
+
+    /**
+     * 自定义装箱货物表新增
+     */
+    void add(PackDetailGoodsDto packDetailGoodsDto);
+
+    /**
+     * 自定义装箱货物表编辑
+     */
+    void edit(PackDetailGoodsDto packDetailGoodsDto);
+
+    /**
+     * 自定义装箱货物表删除
+     */
+    void delete(Long id);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/pack/PackDetailService.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.service.pack;
+
+import com.fjhx.sale.entity.pack.po.PackDetail;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackDetailVo;
+import com.fjhx.sale.entity.pack.dto.PackDetailSelectDto;
+import com.fjhx.sale.entity.pack.dto.PackDetailDto;
+
+
+/**
+ * <p>
+ * 装箱出货明细表	 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+public interface PackDetailService extends BaseService<PackDetail> {
+
+    /**
+     * 装箱出货明细表	分页
+     */
+    Page<PackDetailVo> getPage(PackDetailSelectDto dto);
+
+    /**
+     * 装箱出货明细表	明细
+     */
+    PackDetailVo detail(Long id);
+
+    /**
+     * 装箱出货明细表	新增
+     */
+    void add(PackDetailDto packDetailDto);
+
+    /**
+     * 装箱出货明细表	编辑
+     */
+    void edit(PackDetailDto packDetailDto);
+
+    /**
+     * 装箱出货明细表	删除
+     */
+    void delete(Long id);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/pack/PackProductProductService.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.service.pack;
+
+import com.fjhx.sale.entity.pack.po.PackProductProduct;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackProductProductVo;
+import com.fjhx.sale.entity.pack.dto.PackProductProductSelectDto;
+import com.fjhx.sale.entity.pack.dto.PackProductProductDto;
+
+
+/**
+ * <p>
+ * 装箱出货产品明细表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+public interface PackProductProductService extends BaseService<PackProductProduct> {
+
+    /**
+     * 装箱出货产品明细表分页
+     */
+    Page<PackProductProductVo> getPage(PackProductProductSelectDto dto);
+
+    /**
+     * 装箱出货产品明细表明细
+     */
+    PackProductProductVo detail(Long id);
+
+    /**
+     * 装箱出货产品明细表新增
+     */
+    void add(PackProductProductDto packProductProductDto);
+
+    /**
+     * 装箱出货产品明细表编辑
+     */
+    void edit(PackProductProductDto packProductProductDto);
+
+    /**
+     * 装箱出货产品明细表删除
+     */
+    void delete(Long id);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/pack/PackService.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.service.pack;
+
+import com.fjhx.sale.entity.pack.po.Pack;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackVo;
+import com.fjhx.sale.entity.pack.dto.PackSelectDto;
+import com.fjhx.sale.entity.pack.dto.PackDto;
+
+
+/**
+ * <p>
+ * 装箱出货表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+public interface PackService extends BaseService<Pack> {
+
+    /**
+     * 装箱出货表分页
+     */
+    Page<PackVo> getPage(PackSelectDto dto);
+
+    /**
+     * 装箱出货表明细
+     */
+    PackVo detail(Long id);
+
+    /**
+     * 装箱出货表新增
+     */
+    void add(PackDto packDto);
+
+    /**
+     * 装箱出货表编辑
+     */
+    void edit(PackDto packDto);
+
+    /**
+     * 装箱出货表删除
+     */
+    void delete(Long id);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackDetailGoodsServiceImpl.java

@@ -0,0 +1,57 @@
+package com.fjhx.sale.service.pack.impl;
+
+import com.fjhx.sale.entity.pack.po.PackDetailGoods;
+import com.fjhx.sale.mapper.pack.PackDetailGoodsMapper;
+import com.fjhx.sale.service.pack.PackDetailGoodsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackDetailGoodsVo;
+import com.fjhx.sale.entity.pack.dto.PackDetailGoodsSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.sale.entity.pack.dto.PackDetailGoodsDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 自定义装箱货物表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Service
+public class PackDetailGoodsServiceImpl extends ServiceImpl<PackDetailGoodsMapper, PackDetailGoods> implements PackDetailGoodsService {
+
+    @Override
+    public Page<PackDetailGoodsVo> getPage(PackDetailGoodsSelectDto dto) {
+        IWrapper<PackDetailGoods> wrapper = getWrapper();
+        wrapper.orderByDesc("pdg", PackDetailGoods::getId);
+        Page<PackDetailGoodsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public PackDetailGoodsVo detail(Long id) {
+        PackDetailGoods PackDetailGoods = this.getById(id);
+        PackDetailGoodsVo result = BeanUtil.toBean(PackDetailGoods, PackDetailGoodsVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(PackDetailGoodsDto packDetailGoodsDto) {
+        this.save(packDetailGoodsDto);
+    }
+
+    @Override
+    public void edit(PackDetailGoodsDto packDetailGoodsDto) {
+        this.updateById(packDetailGoodsDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackDetailServiceImpl.java

@@ -0,0 +1,57 @@
+package com.fjhx.sale.service.pack.impl;
+
+import com.fjhx.sale.entity.pack.po.PackDetail;
+import com.fjhx.sale.mapper.pack.PackDetailMapper;
+import com.fjhx.sale.service.pack.PackDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackDetailVo;
+import com.fjhx.sale.entity.pack.dto.PackDetailSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.sale.entity.pack.dto.PackDetailDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 装箱出货明细表	 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Service
+public class PackDetailServiceImpl extends ServiceImpl<PackDetailMapper, PackDetail> implements PackDetailService {
+
+    @Override
+    public Page<PackDetailVo> getPage(PackDetailSelectDto dto) {
+        IWrapper<PackDetail> wrapper = getWrapper();
+        wrapper.orderByDesc("pd", PackDetail::getId);
+        Page<PackDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public PackDetailVo detail(Long id) {
+        PackDetail PackDetail = this.getById(id);
+        PackDetailVo result = BeanUtil.toBean(PackDetail, PackDetailVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(PackDetailDto packDetailDto) {
+        this.save(packDetailDto);
+    }
+
+    @Override
+    public void edit(PackDetailDto packDetailDto) {
+        this.updateById(packDetailDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackProductProductServiceImpl.java

@@ -0,0 +1,57 @@
+package com.fjhx.sale.service.pack.impl;
+
+import com.fjhx.sale.entity.pack.po.PackProductProduct;
+import com.fjhx.sale.mapper.pack.PackProductProductMapper;
+import com.fjhx.sale.service.pack.PackProductProductService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackProductProductVo;
+import com.fjhx.sale.entity.pack.dto.PackProductProductSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.sale.entity.pack.dto.PackProductProductDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 装箱出货产品明细表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Service
+public class PackProductProductServiceImpl extends ServiceImpl<PackProductProductMapper, PackProductProduct> implements PackProductProductService {
+
+    @Override
+    public Page<PackProductProductVo> getPage(PackProductProductSelectDto dto) {
+        IWrapper<PackProductProduct> wrapper = getWrapper();
+        wrapper.orderByDesc("ppp", PackProductProduct::getId);
+        Page<PackProductProductVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public PackProductProductVo detail(Long id) {
+        PackProductProduct PackProductProduct = this.getById(id);
+        PackProductProductVo result = BeanUtil.toBean(PackProductProduct, PackProductProductVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(PackProductProductDto packProductProductDto) {
+        this.save(packProductProductDto);
+    }
+
+    @Override
+    public void edit(PackProductProductDto packProductProductDto) {
+        this.updateById(packProductProductDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackServiceImpl.java

@@ -0,0 +1,57 @@
+package com.fjhx.sale.service.pack.impl;
+
+import com.fjhx.sale.entity.pack.po.Pack;
+import com.fjhx.sale.mapper.pack.PackMapper;
+import com.fjhx.sale.service.pack.PackService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackVo;
+import com.fjhx.sale.entity.pack.dto.PackSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.sale.entity.pack.dto.PackDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 装箱出货表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Service
+public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements PackService {
+
+    @Override
+    public Page<PackVo> getPage(PackSelectDto dto) {
+        IWrapper<Pack> wrapper = getWrapper();
+        wrapper.orderByDesc("p", Pack::getId);
+        Page<PackVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public PackVo detail(Long id) {
+        Pack Pack = this.getById(id);
+        PackVo result = BeanUtil.toBean(Pack, PackVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(PackDto packDto) {
+        this.save(packDto);
+    }
+
+    @Override
+    public void edit(PackDto packDto) {
+        this.updateById(packDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-sale/src/main/resources/claim/ClaimContractMapper.xml

@@ -0,0 +1,18 @@
+<?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.fjhx.sale.mapper.claim.ClaimContractMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.claim.vo.ClaimContractVo">
+        select
+            cc.id,
+            cc.contract_id,
+            cc.money,
+            cc.contract_code,
+            cc.create_user,
+            cc.create_time,
+            cc.update_user,
+            cc.update_time
+        from claim_contract cc
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-sale/src/main/resources/claim/ClaimMapper.xml

@@ -0,0 +1,22 @@
+<?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.fjhx.sale.mapper.claim.ClaimMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.claim.vo.ClaimVo">
+        select
+            c.id,
+            c.amount,
+            c.remark,
+            c.account_management_id,
+            c.currency,
+            c.claim_user_id,
+            c.claim_user_name,
+            c.claim_time,
+            c.create_user,
+            c.create_time,
+            c.update_user,
+            c.update_time
+        from claim c
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-sale/src/main/resources/pack/PackDetailGoodsMapper.xml

@@ -0,0 +1,19 @@
+<?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.fjhx.sale.mapper.pack.PackDetailGoodsMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.pack.vo.PackDetailGoodsVo">
+        select
+            pdg.id,
+            pdg.pack_detail_id,
+            pdg.quantity,
+            pdg.unit,
+            pdg.remark,
+            pdg.create_user,
+            pdg.create_time,
+            pdg.update_user,
+            pdg.update_time
+        from pack_detail_goods pdg
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-sale/src/main/resources/pack/PackDetailMapper.xml

@@ -0,0 +1,31 @@
+<?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.fjhx.sale.mapper.pack.PackDetailMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.pack.vo.PackDetailVo">
+        select
+            pd.id,
+            pd.pack_id,
+            pd.customer_id,
+            pd.contract_id,
+            pd.contract_code,
+            pd.pack_quantity,
+            pd.net_weight,
+            pd.rough_weight,
+            pd.box_long,
+            pd.box_wide,
+            pd.box_high,
+            pd.bom_volume,
+            pd.shipment_time,
+            pd.shipment_status,
+            pd.waybill_code,
+            pd.express_id,
+            pd.remark,
+            pd.update_time,
+            pd.update_user,
+            pd.create_user,
+            pd.create_time
+        from pack_detail pd
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-sale/src/main/resources/pack/PackMapper.xml

@@ -0,0 +1,20 @@
+<?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.fjhx.sale.mapper.pack.PackMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.pack.vo.PackVo">
+        select
+            p.id,
+            p.code,
+            p.customer_id,
+            p.contract_id,
+            p.contract_code,
+            p.remark,
+            p.update_time,
+            p.update_user,
+            p.create_user,
+            p.create_time
+        from pack p
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-sale/src/main/resources/pack/PackProductProductMapper.xml

@@ -0,0 +1,24 @@
+<?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.fjhx.sale.mapper.pack.PackProductProductMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.pack.vo.PackProductProductVo">
+        select
+            ppp.id,
+            ppp.code,
+            ppp.pack_detail_id,
+            ppp.contract_id,
+            ppp.contract_product_id,
+            ppp.quantity,
+            ppp.product_id,
+            ppp.product_name,
+            ppp.product_model,
+            ppp.remark,
+            ppp.update_time,
+            ppp.create_user,
+            ppp.create_time,
+            ppp.update_user
+        from pack_product_product ppp
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>