diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerMainController.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerMainController.java index 2a27a9a8..d1194eb2 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerMainController.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerMainController.java @@ -172,4 +172,16 @@ public class CustomerMainController { return success(true); } + /** + * 用户列表 + * + * @author 小李 + * @date 14:02 2024/9/13 + **/ + @GetMapping("/list") + @Operation(summary = "用户列表") + public CommonResult getCustomerMainList(){ + return success(customerMainService.list()); + } + } \ No newline at end of file diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/BaseSupplierController.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/BaseSupplierController.java index 1a26acf3..14bd5dd9 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/BaseSupplierController.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/BaseSupplierController.java @@ -116,5 +116,15 @@ public class BaseSupplierController { return success(baseSupplierService.queryListPage(pageReqVO,page)); } - + /** + * 获得所有供应商 + * @author 小李 + * @date 9:23 2024/9/13 + **/ + @GetMapping("/list") + @Operation(summary = "获得所有供应商") + @PreAuthorize("@ss.hasPermission('supplier:base-supplier:query')") + public CommonResult getBaseSupplierList(){ + return success(baseSupplierService.list()); + } } \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/controller/admin/DlRepairSoController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/controller/admin/DlRepairSoController.java new file mode 100644 index 00000000..c0e01b64 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/controller/admin/DlRepairSoController.java @@ -0,0 +1,46 @@ +package cn.iocoder.yudao.module.stockOperate.controller.admin; + + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.stockOperate.entity.DlRepairSo; +import cn.iocoder.yudao.module.stockOperate.service.DlRepairSoService; +import cn.iocoder.yudao.module.stockOperate.vo.DlRepairSoReqVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 采购单领料单(DlRepairSo)表控制层 + * @author 小李 + * @date 9:13 2024/9/13 +**/ +@RestController +@RequestMapping("/repair/so") +public class DlRepairSoController { + /** + * 服务对象 + */ + @Resource + private DlRepairSoService dlRepairSoService; + + /** + * 分页查询所有数据 + * @author 小李 + * @date 16:12 2024/9/13 + * @param repairSoReqVO 查询对象 + * @param pageNo 页码 + * @param pageSize 条数 + **/ + @GetMapping("/page") + public CommonResult getDlRepairSoPage(DlRepairSoReqVO repairSoReqVO, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNo, pageSize); + return null; + } +} + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/controller/admin/DlRepairSoiController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/controller/admin/DlRepairSoiController.java new file mode 100644 index 00000000..15888bd3 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/controller/admin/DlRepairSoiController.java @@ -0,0 +1,80 @@ +package cn.iocoder.yudao.module.stockOperate.controller.admin; + + +import cn.iocoder.yudao.module.stockOperate.service.DlRepairSoiService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 采购单领料单子表(DlRepairSoi)表控制层 + * @author 小李 + * @date 9:14 2024/9/13 +**/ +@RestController +@RequestMapping("/repair/soi") +public class DlRepairSoiController{ + /** + * 服务对象 + */ + @Resource + private DlRepairSoiService dlRepairSoiService; + +// /** +// * 分页查询所有数据 +// * +// * @param page 分页对象 +// * @param dlRepairSoi 查询实体 +// * @return 所有数据 +// */ +// @GetMapping +// public R selectAll(Page page, DlRepairSoi dlRepairSoi) { +// return success(this.dlRepairSoiService.page(page, new QueryWrapper<>(dlRepairSoi))); +// } +// +// /** +// * 通过主键查询单条数据 +// * +// * @param id 主键 +// * @return 单条数据 +// */ +// @GetMapping("{id}") +// public R selectOne(@PathVariable Serializable id) { +// return success(this.dlRepairSoiService.getById(id)); +// } +// +// /** +// * 新增数据 +// * +// * @param dlRepairSoi 实体对象 +// * @return 新增结果 +// */ +// @PostMapping +// public R insert(@RequestBody DlRepairSoi dlRepairSoi) { +// return success(this.dlRepairSoiService.save(dlRepairSoi)); +// } +// +// /** +// * 修改数据 +// * +// * @param dlRepairSoi 实体对象 +// * @return 修改结果 +// */ +// @PutMapping +// public R update(@RequestBody DlRepairSoi dlRepairSoi) { +// return success(this.dlRepairSoiService.updateById(dlRepairSoi)); +// } +// +// /** +// * 删除数据 +// * +// * @param idList 主键结合 +// * @return 删除结果 +// */ +// @DeleteMapping +// public R delete(@RequestParam("idList") List idList) { +// return success(this.dlRepairSoiService.removeByIds(idList)); +// } +} + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/entity/DlRepairSo.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/entity/DlRepairSo.java new file mode 100644 index 00000000..c7067e42 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/entity/DlRepairSo.java @@ -0,0 +1,108 @@ +package cn.iocoder.yudao.module.stockOperate.entity; + +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 采购单领料单 + * @TableName dl_repair_so + */ +/** + * 采购单/领料单 + * @author 小李 + * @date 8:54 2024/9/13 +**/ +@TableName(value ="dl_repair_so") +@Data +@EqualsAndHashCode(callSuper = true) +public class DlRepairSo extends TenantBaseDO { + /** + * 主键标识 + */ + @TableId(type = IdType.ASSIGN_ID) + private String id; + + /** + * 单据类型(字典repair_so_type) + */ + private String soType; + + /** + * 采购单类型(字典repair_purchase_type) + */ + private String purchaseType; + + /** + * 单据编号;自动生成 + */ + private String soNo; + + /** + * 供应商ID(dl_base_supplier表的ID) + */ + private String supplierId; + + /** + * 供应商名称(dl_base_supplier表的name) + */ + private String supplierName; + + /** + * 采购员/领料人ID(system_users表的ID) + */ + private Long userId; + + /** + * 采购员/领料人名字(company_staff表的name) + */ + private String userName; + + /** + * 采购时间/领料时间 + */ + private Date soTime; + + /** + * 商品的总数量;自动生成 + */ + private Integer itemCount; + + /** + * 商品的总价;自动生成 + */ + private BigDecimal totalPrice; + + /** + * 单据状态(字典repair_so_status) + */ + private String soStatus; + + /** + * 备注 + */ + private String remark; + + /** + * 门店ID(base_company表的ID) + */ + private String corpId; + + /** + * 门店名称(base_company表的corp_name) + */ + private String corpName; + + /** + * 部门ID(system_dept表的ID) + */ + private Long deptId; +} \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/entity/DlRepairSoi.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/entity/DlRepairSoi.java new file mode 100644 index 00000000..295e0b67 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/entity/DlRepairSoi.java @@ -0,0 +1,65 @@ +package cn.iocoder.yudao.module.stockOperate.entity; + +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 采购单领料单子表 + * @TableName dl_repair_soi + */ +/** + * 采购单/领料单子表 + * @author 小李 + * @date 8:56 2024/9/13 +**/ +@TableName(value ="dl_repair_soi") +@Data +@EqualsAndHashCode(callSuper = true) +public class DlRepairSoi extends TenantBaseDO { + /** + * 主键标识 + */ + @TableId(type = IdType.ASSIGN_ID) + private String id; + + /** + * 采购单ID(dl_repair_so表的ID) + */ + private String soId; + + /** + * 配件表ID(dl_base_type的ID) + */ + private String goodsId; + + /** + * 配件类型(是否急件，字典yes_no) + */ + private String goodsType; + + /** + * 仓库ID(dl_base_warehouse的ID) + */ + private String wareId; + + /** + * 商品数量 + */ + private Integer goodsCount; + + /** + * 商品单价 + */ + private BigDecimal goodsPrice; + + /** + * 备注 + */ + private String remark; +} \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/mapper/DlRepairSoMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/mapper/DlRepairSoMapper.java new file mode 100644 index 00000000..16fb7386 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/mapper/DlRepairSoMapper.java @@ -0,0 +1,19 @@ +package cn.iocoder.yudao.module.stockOperate.mapper; + +import cn.iocoder.yudao.module.stockOperate.entity.DlRepairSo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 针对表【dl_repair_so(采购单领料单)】的数据库操作Mapper + * @author 小李 + * @date 9:03 2024/9/13 +**/ +@Mapper +public interface DlRepairSoMapper extends BaseMapper { + +} + + + + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/mapper/DlRepairSoiMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/mapper/DlRepairSoiMapper.java new file mode 100644 index 00000000..0eb5a78c --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/mapper/DlRepairSoiMapper.java @@ -0,0 +1,18 @@ +package cn.iocoder.yudao.module.stockOperate.mapper; + +import cn.iocoder.yudao.module.stockOperate.entity.DlRepairSoi; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 针对表【dl_repair_soi(采购单领料单子表)】的数据库操作Mapper + * @author 小李 + * @date 9:02 2024/9/13 +**/ +@Mapper +public interface DlRepairSoiMapper extends BaseMapper { +} + + + + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/DlRepairSoService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/DlRepairSoService.java new file mode 100644 index 00000000..24e4a6a6 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/DlRepairSoService.java @@ -0,0 +1,12 @@ +package cn.iocoder.yudao.module.stockOperate.service; + +import cn.iocoder.yudao.module.stockOperate.entity.DlRepairSo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 针对表【dl_repair_so(采购单领料单)】的数据库操作Service + * @author 小李 + * @date 9:09 2024/9/13 +**/ +public interface DlRepairSoService extends IService { +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/DlRepairSoiService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/DlRepairSoiService.java new file mode 100644 index 00000000..15b0a3e6 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/DlRepairSoiService.java @@ -0,0 +1,12 @@ +package cn.iocoder.yudao.module.stockOperate.service; + +import cn.iocoder.yudao.module.stockOperate.entity.DlRepairSoi; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 针对表【dl_repair_soi(采购单领料单子表)】的数据库操作Service + * @author 小李 + * @date 9:09 2024/9/13 +**/ +public interface DlRepairSoiService extends IService { +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java new file mode 100644 index 00000000..95380949 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java @@ -0,0 +1,23 @@ +package cn.iocoder.yudao.module.stockOperate.service.impl; + +import cn.iocoder.yudao.module.stockOperate.entity.DlRepairSo; +import cn.iocoder.yudao.module.stockOperate.mapper.DlRepairSoMapper; +import cn.iocoder.yudao.module.stockOperate.service.DlRepairSoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 针对表【dl_repair_so(采购单领料单)】的数据库操作Service实现 + * + * @author 小李 + * @date 9:11 2024/9/13 + **/ +@Service +public class DlRepairSoServiceImpl extends ServiceImpl + implements DlRepairSoService { + +} + + + + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoiServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoiServiceImpl.java new file mode 100644 index 00000000..353728fd --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoiServiceImpl.java @@ -0,0 +1,22 @@ +package cn.iocoder.yudao.module.stockOperate.service.impl; + +import cn.iocoder.yudao.module.stockOperate.entity.DlRepairSoi; +import cn.iocoder.yudao.module.stockOperate.mapper.DlRepairSoiMapper; +import cn.iocoder.yudao.module.stockOperate.service.DlRepairSoiService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 针对表【dl_repair_soi(采购单领料单子表)】的数据库操作Service实现 + * + * @author 小李 + * @date 9:10 2024/9/13 + **/ +@Service +public class DlRepairSoiServiceImpl extends ServiceImpl + implements DlRepairSoiService { +} + + + + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoReqVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoReqVO.java new file mode 100644 index 00000000..a9997442 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoReqVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.stockOperate.vo; + +import cn.iocoder.yudao.module.stockOperate.entity.DlRepairSo; +import lombok.Data; + +/** + * 采购单/领料单 请求VO + * @author 小李 + * @date 8:59 2024/9/13 +**/ +@Data +public class DlRepairSoReqVO extends DlRepairSo { +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoRespVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoRespVO.java new file mode 100644 index 00000000..6d402f29 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoRespVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.stockOperate.vo; + +import cn.iocoder.yudao.module.stockOperate.entity.DlRepairSo; +import lombok.Data; + +/** + * 采购单/领料单 响应VO + * @author 小李 + * @date 8:59 2024/9/13 +**/ +@Data +public class DlRepairSoRespVO extends DlRepairSo { +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoiReqVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoiReqVO.java new file mode 100644 index 00000000..0a3849de --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoiReqVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.stockOperate.vo; + +import cn.iocoder.yudao.module.stockOperate.entity.DlRepairSoi; +import lombok.Data; + +/** + * 采购单/领料单子表 请求VO + * @author 小李 + * @date 9:00 2024/9/13 +**/ +@Data +public class DlRepairSoiReqVO extends DlRepairSoi { +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoiRespVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoiRespVO.java new file mode 100644 index 00000000..59bfc3de --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoiRespVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.stockOperate.vo; + +import cn.iocoder.yudao.module.stockOperate.entity.DlRepairSoi; +import lombok.Data; + +/** + * 采购单/领料单子表 响应VO + * @author 小李 + * @date 9:00 2024/9/13 +**/ +@Data +public class DlRepairSoiRespVO extends DlRepairSoi { +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStController.java new file mode 100644 index 00000000..129b4eaf --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStController.java @@ -0,0 +1,80 @@ +package cn.iocoder.yudao.module.stockTransfer.controller.admin; + + +import cn.iocoder.yudao.module.stockTransfer.service.DlRepairStService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 调拨单(DlRepairSt)表控制层 + * @author 小李 + * @date 17:26 2024/9/13 +**/ +@RestController +@RequestMapping("/repair/st") +public class DlRepairStController{ + /** + * 服务对象 + */ + @Resource + private DlRepairStService dlRepairStService; + +// /** +// * 分页查询所有数据 +// * +// * @param page 分页对象 +// * @param dlRepairSt 查询实体 +// * @return 所有数据 +// */ +// @GetMapping +// public R selectAll(Page page, DlRepairSt dlRepairSt) { +// return success(this.dlRepairStService.page(page, new QueryWrapper<>(dlRepairSt))); +// } +// +// /** +// * 通过主键查询单条数据 +// * +// * @param id 主键 +// * @return 单条数据 +// */ +// @GetMapping("{id}") +// public R selectOne(@PathVariable Serializable id) { +// return success(this.dlRepairStService.getById(id)); +// } +// +// /** +// * 新增数据 +// * +// * @param dlRepairSt 实体对象 +// * @return 新增结果 +// */ +// @PostMapping +// public R insert(@RequestBody DlRepairSt dlRepairSt) { +// return success(this.dlRepairStService.save(dlRepairSt)); +// } +// +// /** +// * 修改数据 +// * +// * @param dlRepairSt 实体对象 +// * @return 修改结果 +// */ +// @PutMapping +// public R update(@RequestBody DlRepairSt dlRepairSt) { +// return success(this.dlRepairStService.updateById(dlRepairSt)); +// } +// +// /** +// * 删除数据 +// * +// * @param idList 主键结合 +// * @return 删除结果 +// */ +// @DeleteMapping +// public R delete(@RequestParam("idList") List idList) { +// return success(this.dlRepairStService.removeByIds(idList)); +// } +} + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStiController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStiController.java new file mode 100644 index 00000000..7e0ca9f2 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStiController.java @@ -0,0 +1,80 @@ +package cn.iocoder.yudao.module.stockTransfer.controller.admin; + + +import cn.iocoder.yudao.module.stockTransfer.service.DlRepairStiService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 调拨单子表(DlRepairSti)表控制层 + * @author 小李 + * @date 17:27 2024/9/13 +**/ +@RestController +@RequestMapping("/repair/sti") +public class DlRepairStiController{ + /** + * 服务对象 + */ + @Resource + private DlRepairStiService dlRepairStiService; + +// /** +// * 分页查询所有数据 +// * +// * @param page 分页对象 +// * @param dlRepairSti 查询实体 +// * @return 所有数据 +// */ +// @GetMapping +// public R selectAll(Page page, DlRepairSti dlRepairSti) { +// return success(this.dlRepairStiService.page(page, new QueryWrapper<>(dlRepairSti))); +// } +// +// /** +// * 通过主键查询单条数据 +// * +// * @param id 主键 +// * @return 单条数据 +// */ +// @GetMapping("{id}") +// public R selectOne(@PathVariable Serializable id) { +// return success(this.dlRepairStiService.getById(id)); +// } +// +// /** +// * 新增数据 +// * +// * @param dlRepairSti 实体对象 +// * @return 新增结果 +// */ +// @PostMapping +// public R insert(@RequestBody DlRepairSti dlRepairSti) { +// return success(this.dlRepairStiService.save(dlRepairSti)); +// } +// +// /** +// * 修改数据 +// * +// * @param dlRepairSti 实体对象 +// * @return 修改结果 +// */ +// @PutMapping +// public R update(@RequestBody DlRepairSti dlRepairSti) { +// return success(this.dlRepairStiService.updateById(dlRepairSti)); +// } +// +// /** +// * 删除数据 +// * +// * @param idList 主键结合 +// * @return 删除结果 +// */ +// @DeleteMapping +// public R delete(@RequestParam("idList") List idList) { +// return success(this.dlRepairStiService.removeByIds(idList)); +// } +} + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/entity/DlRepairSt.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/entity/DlRepairSt.java new file mode 100644 index 00000000..fcdd69d4 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/entity/DlRepairSt.java @@ -0,0 +1,94 @@ +package cn.iocoder.yudao.module.stockTransfer.entity; + +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 调拨单 + * @author 小李 + * @date 17:10 2024/9/13 +**/ +@TableName(value ="dl_repair_st") +@Data +@EqualsAndHashCode(callSuper = true) +public class DlRepairSt extends TenantBaseDO { + /** + * 主键标识 + */ + @TableId(type = IdType.ASSIGN_ID) + private String id; + + /** + * 调出门店(dl_base_corp表的ID) + */ + private String outCorpId; + + /** + * 调入门店(dl_base_corp表的ID) + */ + private String inCorpId; + + /** + * 单据编号;自动生成 + */ + private String stNo; + + /** + * 调拨人(system_users表的ID) + */ + private Long userId; + + /** + * 调拨人名字(company_staff表的name) + */ + private String userName; + + /** + * 商品总数;自动生成 + */ + private Integer itemCount; + + /** + * 商品总价;自动生成 + */ + private BigDecimal totalPrice; + + /** + * 优惠金额 + */ + private BigDecimal discountPrice; + + /** + * 本次收款 + */ + private BigDecimal thisCollection; + + /** + * 本次欠款;自动生成 + */ + private BigDecimal thisDebt; + + /** + * 调拨单状态(字典repair_st_status) + */ + private String stStatus; + + /** + * 调拔时间 + */ + private Date stTime; + + /** + * 备注 + */ + private String remark; +} \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/entity/DlRepairSti.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/entity/DlRepairSti.java new file mode 100644 index 00000000..caeb31d5 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/entity/DlRepairSti.java @@ -0,0 +1,56 @@ +package cn.iocoder.yudao.module.stockTransfer.entity; + +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 调拨单子表 + * @author 小李 + * @date 17:11 2024/9/13 +**/ +@TableName(value ="dl_repair_sti") +@Data +@EqualsAndHashCode(callSuper = true) +public class DlRepairSti extends TenantBaseDO { + /** + * 主键标识 + */ + @TableId(type = IdType.ASSIGN_ID) + private String id; + + /** + * 调拨单ID(dl_repair_st表的ID) + */ + private String stId; + + /** + * 配件表ID(dl_base_type的ID) + */ + private String goodsId; + + /** + * 商品数量 + */ + private Integer goodsCount; + + /** + * 结算单价 + */ + private BigDecimal goodsPrice; + + /** + * 备注 + */ + private String remark; + + /** + * 部门ID(system_dept表的ID) + */ + private Long deptId; +} \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStMapper.java new file mode 100644 index 00000000..45eaefb7 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStMapper.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.stockTransfer.mapper; + +import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSt; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 针对表【dl_repair_st(调拨单)】的数据库操作Mapper + * + * @author 小李 + * @date 17:16 2024/9/13 + **/ +@Mapper +public interface DlRepairStMapper extends BaseMapper { + +} + + + + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStiMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStiMapper.java new file mode 100644 index 00000000..996f94e5 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStiMapper.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.stockTransfer.mapper; + +import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSti; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 针对表【dl_repair_sti(调拨单子表)】的数据库操作Mapper + * + * @author 小李 + * @date 17:15 2024/9/13 + **/ +@Mapper +public interface DlRepairStiMapper extends BaseMapper { + +} + + + + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStService.java new file mode 100644 index 00000000..a6284141 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStService.java @@ -0,0 +1,14 @@ +package cn.iocoder.yudao.module.stockTransfer.service; + +import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSt; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 针对表【dl_repair_st(调拨单)】的数据库操作Service + * + * @author 小李 + * @date 17:22 2024/9/13 + **/ +public interface DlRepairStService extends IService { + +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStiService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStiService.java new file mode 100644 index 00000000..a47980d6 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStiService.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.stockTransfer.service; + +import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSti; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 针对表【dl_repair_sti(调拨单子表)】的数据库操作Service + * @author 小李 + * @date 17:21 2024/9/13 +**/ +public interface DlRepairStiService extends IService { + +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStServiceImpl.java new file mode 100644 index 00000000..6bb108d3 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStServiceImpl.java @@ -0,0 +1,23 @@ +package cn.iocoder.yudao.module.stockTransfer.service.impl; + +import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSt; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.iocoder.yudao.module.stockTransfer.service.DlRepairStService; +import cn.iocoder.yudao.module.stockTransfer.mapper.DlRepairStMapper; +import org.springframework.stereotype.Service; + +/** + * 针对表【dl_repair_st(调拨单)】的数据库操作Service实现 + * + * @author 小李 + * @date 17:23 2024/9/13 + **/ +@Service +public class DlRepairStServiceImpl extends ServiceImpl + implements DlRepairStService { + +} + + + + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStiServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStiServiceImpl.java new file mode 100644 index 00000000..7572dea3 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStiServiceImpl.java @@ -0,0 +1,23 @@ +package cn.iocoder.yudao.module.stockTransfer.service.impl; + +import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSti; +import cn.iocoder.yudao.module.stockTransfer.mapper.DlRepairStiMapper; +import cn.iocoder.yudao.module.stockTransfer.service.DlRepairStiService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 针对表【dl_repair_sti(调拨单子表)】的数据库操作Service实现 + * + * @author 小李 + * @date 17:22 2024/9/13 + **/ +@Service +public class DlRepairStiServiceImpl extends ServiceImpl + implements DlRepairStiService { + +} + + + + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/vo/DlRepairStReqVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/vo/DlRepairStReqVO.java new file mode 100644 index 00000000..583d0289 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/vo/DlRepairStReqVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.stockTransfer.vo; + +import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSt; +import lombok.Data; + +/** + * 调拨单 请求VO + * @author 小李 + * @date 17:13 2024/9/13 +**/ +@Data +public class DlRepairStReqVO extends DlRepairSt { +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/vo/DlRepairStRespVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/vo/DlRepairStRespVO.java new file mode 100644 index 00000000..c94ca09a --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/vo/DlRepairStRespVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.stockTransfer.vo; + +import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSt; +import lombok.Data; + +/** + * 调拨单 响应VO + * @author 小李 + * @date 17:13 2024/9/13 +**/ +@Data +public class DlRepairStRespVO extends DlRepairSt { +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/vo/DlRepairStiReqVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/vo/DlRepairStiReqVO.java new file mode 100644 index 00000000..10c19e51 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/vo/DlRepairStiReqVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.stockTransfer.vo; + +import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSti; +import lombok.Data; + +/** + * 调拨单子表 请求VO + * @author 小李 + * @date 17:14 2024/9/13 +**/ +@Data +public class DlRepairStiReqVO extends DlRepairSti { +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/vo/DlRepairStiRespVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/vo/DlRepairStiRespVO.java new file mode 100644 index 00000000..0fb81c45 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/vo/DlRepairStiRespVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.stockTransfer.vo; + +import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSti; +import lombok.Data; + +/** + * 调拨单子表 响应VO + * @author 小李 + * @date 17:14 2024/9/13 +**/ +@Data +public class DlRepairStiRespVO extends DlRepairSti { +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java new file mode 100644 index 00000000..12dcfd37 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java @@ -0,0 +1,80 @@ +package cn.iocoder.yudao.module.tickets.controller.admin; + + +import cn.iocoder.yudao.module.tickets.service.DlRepairTicketsService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 维修工单表(DlRepairTickets)表控制层 + * @author 小李 + * @date 18:21 2024/9/13 +**/ +@RestController +@RequestMapping("dlRepairTickets") +public class DlRepairTicketsController { + /** + * 服务对象 + */ + @Resource + private DlRepairTicketsService dlRepairTicketsService; + +// /** +// * 分页查询所有数据 +// * +// * @param page 分页对象 +// * @param dlRepairTickets 查询实体 +// * @return 所有数据 +// */ +// @GetMapping +// public R selectAll(Page page, DlRepairTickets dlRepairTickets) { +// return success(this.dlRepairTicketsService.page(page, new QueryWrapper<>(dlRepairTickets))); +// } +// +// /** +// * 通过主键查询单条数据 +// * +// * @param id 主键 +// * @return 单条数据 +// */ +// @GetMapping("{id}") +// public R selectOne(@PathVariable Serializable id) { +// return success(this.dlRepairTicketsService.getById(id)); +// } +// +// /** +// * 新增数据 +// * +// * @param dlRepairTickets 实体对象 +// * @return 新增结果 +// */ +// @PostMapping +// public R insert(@RequestBody DlRepairTickets dlRepairTickets) { +// return success(this.dlRepairTicketsService.save(dlRepairTickets)); +// } +// +// /** +// * 修改数据 +// * +// * @param dlRepairTickets 实体对象 +// * @return 修改结果 +// */ +// @PutMapping +// public R update(@RequestBody DlRepairTickets dlRepairTickets) { +// return success(this.dlRepairTicketsService.updateById(dlRepairTickets)); +// } +// +// /** +// * 删除数据 +// * +// * @param idList 主键结合 +// * @return 删除结果 +// */ +// @DeleteMapping +// public R delete(@RequestParam("idList") List idList) { +// return success(this.dlRepairTicketsService.removeByIds(idList)); +// } +} + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java new file mode 100644 index 00000000..3f30a458 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java @@ -0,0 +1,81 @@ +package cn.iocoder.yudao.module.tickets.controller.admin; + + +import cn.iocoder.yudao.module.tickets.service.DlRepairTitemService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 维修工单子表(DlRepairTitem)表控制层 + * + * @author 小李 + * @date 18:21 2024/9/13 + **/ +@RestController +@RequestMapping("dlRepairTitem") +public class DlRepairTitemController { + /** + * 服务对象 + */ + @Resource + private DlRepairTitemService dlRepairTitemService; + +// /** +// * 分页查询所有数据 +// * +// * @param page 分页对象 +// * @param dlRepairTitem 查询实体 +// * @return 所有数据 +// */ +// @GetMapping +// public R selectAll(Page page, DlRepairTitem dlRepairTitem) { +// return success(this.dlRepairTitemService.page(page, new QueryWrapper<>(dlRepairTitem))); +// } +// +// /** +// * 通过主键查询单条数据 +// * +// * @param id 主键 +// * @return 单条数据 +// */ +// @GetMapping("{id}") +// public R selectOne(@PathVariable Serializable id) { +// return success(this.dlRepairTitemService.getById(id)); +// } +// +// /** +// * 新增数据 +// * +// * @param dlRepairTitem 实体对象 +// * @return 新增结果 +// */ +// @PostMapping +// public R insert(@RequestBody DlRepairTitem dlRepairTitem) { +// return success(this.dlRepairTitemService.save(dlRepairTitem)); +// } +// +// /** +// * 修改数据 +// * +// * @param dlRepairTitem 实体对象 +// * @return 修改结果 +// */ +// @PutMapping +// public R update(@RequestBody DlRepairTitem dlRepairTitem) { +// return success(this.dlRepairTitemService.updateById(dlRepairTitem)); +// } +// +// /** +// * 删除数据 +// * +// * @param idList 主键结合 +// * @return 删除结果 +// */ +// @DeleteMapping +// public R delete(@RequestParam("idList") List idList) { +// return success(this.dlRepairTitemService.removeByIds(idList)); +// } +} + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlRepairTickets.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlRepairTickets.java new file mode 100644 index 00000000..cc0f3ccd --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlRepairTickets.java @@ -0,0 +1,134 @@ +package cn.iocoder.yudao.module.tickets.entity; + +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 维修工单表 + * @author 小李 + * @date 17:29 2024/9/13 +**/ +@TableName(value ="dl_repair_tickets") +@Data +@EqualsAndHashCode(callSuper = true) +public class DlRepairTickets extends TenantBaseDO { + /** + * 主键标识 + */ + @TableId(type = IdType.ASSIGN_ID) + private String id; + + /** + * 工单号;自动生成 + */ + private String ticketNo; + + /** + * 业务类型(repair_type) + */ + private String repairType; + + /** + * 用户ID(system_users表的ID) + */ + private Long userId; + + /** + * 用户名(base_customer_main表的cus_name) + */ + private String userName; + + /** + * 用户手机号(base_customer_main表的phone_number) + */ + private String userMobile; + + /** + * 车辆ID(base_car_main表的ID);选择用户之后选择车辆，有直接选，没有就添加 + */ + private String carId; + + /** + * 车牌号(base_car_main表的license_number) + */ + private String carNo; + + /** + * 车架号(base_car_main的vin) + */ + private String carVin; + + /** + * 车辆品牌ID(base_car_brand表的ID);车辆存在就会有品牌，没有就需要新增 + */ + private String carBrandId; + + /** + * 车辆品牌名称(base_car_brand表的brand_name) + */ + private String carBrandName; + + /** + * 车辆品牌类型(base_car_brand表的brand_type) + */ + private String carBrandType; + + /** + * 服务顾问ID(system_users表的ID) + */ + private String adviserId; + + /** + * 服务顾问名字(system_user表的nickname) + */ + private String adviserName; + + /** + * 结算方法(字典repair_pay_type);可能是组合结算(微信+现金等)，所以多选 + */ + private String payType; + + /** + * 维修建议 + */ + private String repairAdvice; + + /** + * 质保说明 + */ + private String qualityExplain; + + /** + * 是否终检(字典yes_no);已存在于系统中(是:0,否:1) + */ + private String endCheck; + + /** + * 维修旧件处理方式(字典repair_part_disposal) + */ + private String partDisposal; + + /** + * 备注 + */ + private String remark; + + /** + * 工单类型(字典repair_tickets_type) + */ + private String ticketType; + + /** + * 门店ID(base_company表的ID) + */ + private String corpId; + + /** + * 部门ID + */ + private Long deptId; +} \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlRepairTitem.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlRepairTitem.java new file mode 100644 index 00000000..6a30f84f --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlRepairTitem.java @@ -0,0 +1,121 @@ +package cn.iocoder.yudao.module.tickets.entity; + +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 维修工单子表 + * @author 小李 + * @date 17:30 2024/9/13 +**/ +@TableName(value ="dl_repair_titem") +@Data +@EqualsAndHashCode(callSuper = true) +public class DlRepairTitem extends TenantBaseDO { + /** + * 主键标识 + */ + @TableId(type = IdType.ASSIGN_ID) + private String id; + + /** + * 工单ID(dl_repair_tickets表的ID) + */ + private String tichetId; + + /** + * 名称;计划前端写的时候可以监听一下，动态查一下历史的记录推荐给使用者选 + */ + private String itemName; + + /** + * 数量 + */ + private Integer itemCount; + + /** + * 单位;计划前端写的时候可以监听一下，动态查一下历史的记录推荐给使用者选 + */ + private String itemUnit; + + /** + * 单价 + */ + private BigDecimal itemPrice; + + /** + * 折扣 + */ + private BigDecimal itemDiscount; + + /** + * 金额;正常是自动计算 + */ + private BigDecimal itemMoney; + + /** + * 维修人员ID(system_users表的ID) + */ + private Long repairId; + + /** + * 维修人员名字(company_staff表的name) + */ + private String repairName; + + /** + * 销售人员ID(system_users表的ID) + */ + private Long saleId; + + /** + * 销售人员名字(company_staff表的name) + */ + private String saleName; + + /** + * 子项类型(字典repair_item_type) + */ + private String itemType; + + /** + * 项目ID(dl_repair_project表的ID) + */ + private String projectId; + + /** + * 配件ID(dl_base_type表的ID) + */ + private String partId; + + /** + * 项目类型(dl_repair_project表的ID);正常是自动回显 + */ + private String projectTypeId; + + /** + * 配件类型(dl_base_type表的ID);正常是自动回显 + */ + private String partTypeId; + + /** + * 其他类型(dl_base_type表的ID) + */ + private String otherTypeId; + + /** + * 状态(字典repair_item_status) + */ + private String itemStatus; + + /** + * 备注 + */ + private String remark; +} \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/mapper/DlRepairTicketsMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/mapper/DlRepairTicketsMapper.java new file mode 100644 index 00000000..b55826f6 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/mapper/DlRepairTicketsMapper.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.tickets.mapper; + +import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 针对表【dl_repair_tickets(维修工单表)】的数据库操作Mapper + * + * @author 小李 + * @date 17:34 2024/9/13 + **/ +@Mapper +public interface DlRepairTicketsMapper extends BaseMapper { + +} + + + + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/mapper/DlRepairTitemMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/mapper/DlRepairTitemMapper.java new file mode 100644 index 00000000..5f25da2d --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/mapper/DlRepairTitemMapper.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.tickets.mapper; + +import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 针对表【dl_repair_titem(维修工单子表)】的数据库操作Mapper + * + * @author 小李 + * @date 17:34 2024/9/13 + **/ +@Mapper +public interface DlRepairTitemMapper extends BaseMapper { + +} + + + + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java new file mode 100644 index 00000000..10b46af8 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java @@ -0,0 +1,14 @@ +package cn.iocoder.yudao.module.tickets.service; + +import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 针对表【dl_repair_tickets(维修工单表)】的数据库操作Service + * + * @author 小李 + * @date 17:39 2024/9/13 + **/ +public interface DlRepairTicketsService extends IService { + +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTitemService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTitemService.java new file mode 100644 index 00000000..c6fb62a3 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTitemService.java @@ -0,0 +1,14 @@ +package cn.iocoder.yudao.module.tickets.service; + +import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 针对表【dl_repair_titem(维修工单子表)】的数据库操作Service + * + * @author 小李 + * @date 17:40 2024/9/13 + **/ +public interface DlRepairTitemService extends IService { + +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java new file mode 100644 index 00000000..40e23283 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java @@ -0,0 +1,23 @@ +package cn.iocoder.yudao.module.tickets.service.impl; + +import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets; +import cn.iocoder.yudao.module.tickets.mapper.DlRepairTicketsMapper; +import cn.iocoder.yudao.module.tickets.service.DlRepairTicketsService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 针对表【dl_repair_tickets(维修工单表)】的数据库操作Service实现 + * + * @author 小李 + * @date 18:19 2024/9/13 + **/ +@Service +public class DlRepairTicketsServiceImpl extends ServiceImpl + implements DlRepairTicketsService { + +} + + + + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java new file mode 100644 index 00000000..e0850a10 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java @@ -0,0 +1,23 @@ +package cn.iocoder.yudao.module.tickets.service.impl; + +import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem; +import cn.iocoder.yudao.module.tickets.mapper.DlRepairTitemMapper; +import cn.iocoder.yudao.module.tickets.service.DlRepairTitemService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 针对表【dl_repair_titem(维修工单子表)】的数据库操作Service实现 + * + * @author 小李 + * @date 18:20 2024/9/13 + **/ +@Service +public class DlRepairTitemServiceImpl extends ServiceImpl + implements DlRepairTitemService { + +} + + + + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java new file mode 100644 index 00000000..822a2cc5 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.tickets.vo; + +import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets; +import lombok.Data; + +/** + * 维修工单表 请求VO + * @author 小李 + * @date 17:31 2024/9/13 +**/ +@Data +public class DlRepairTicketsReqVO extends DlRepairTickets { +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsRespVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsRespVO.java new file mode 100644 index 00000000..6849bce1 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsRespVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.tickets.vo; + +import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets; +import lombok.Data; + +/** + * 维修工单表 响应VO + * @author 小李 + * @date 17:31 2024/9/13 +**/ +@Data +public class DlRepairTicketsRespVO extends DlRepairTickets { +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTitemReqVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTitemReqVO.java new file mode 100644 index 00000000..a03a790c --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTitemReqVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.tickets.vo; + +import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem; +import lombok.Data; + +/** + * 维修工单子表 请求VO + * @author 小李 + * @date 17:32 2024/9/13 +**/ +@Data +public class DlRepairTitemReqVO extends DlRepairTitem { +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTitemRespVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTitemRespVO.java new file mode 100644 index 00000000..ad2149f5 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTitemRespVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.tickets.vo; + +import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem; +import lombok.Data; + +/** + * 维修工单子表 响应VO + * @author 小李 + * @date 17:32 2024/9/13 +**/ +@Data +public class DlRepairTitemRespVO extends DlRepairTitem { +} diff --git a/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml b/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml new file mode 100644 index 00000000..f7f5bc7f --- /dev/null +++ b/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select id, + so_type, + purchase_type, + so_no, + supplier_id, + supplier_name, + user_id, + user_name, + so_time, + item_count, + total_price, + so_status, + remark, + corp_id, + corp_name, + dept_id + from dl_repair_so so + where so.deleted = '0' + + diff --git a/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoiMapper.xml b/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoiMapper.xml new file mode 100644 index 00000000..17645a27 --- /dev/null +++ b/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoiMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + select id, + so_id, + goods_id, + goods_type, + ware_id, + goods_count, + goods_price, + remark + from dl_repair_soi soi + where soi.deleted = '0' + + diff --git a/dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStMapper.xml b/dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStMapper.xml new file mode 100644 index 00000000..4daa1e4e --- /dev/null +++ b/dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, + out_corp_id, + in_corp_id, + st_no, + user_id, + user_name, + item_count, + total_price, + discount_price, + this_collection, + this_debt, + st_status, + st_time, + remark + from dl_repair_st st + where st.deleted = '0' + + diff --git a/dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStiMapper.xml b/dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStiMapper.xml new file mode 100644 index 00000000..f71d84de --- /dev/null +++ b/dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStiMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + select id, + st_id, + goods_id, + goods_count, + goods_price, + remark, + dept_id + from dl_repair_sti sti + where sti.deleted = '0' + + diff --git a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml new file mode 100644 index 00000000..9fc13379 --- /dev/null +++ b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, + ticket_no, + repair_type, + user_id, + user_name, + user_mobile, + car_id, + car_no, + car_vin, + car_brand_id, + car_brand_name, + car_brand_type, + adviser_id, + adviser_name, + pay_type, + repair_advice, + quality_explain, + end_check, + part_disposal, + remark, + ticket_type, + corp_id, + dept_id + from dl_repair_tickets drt + where drt.deleted = '0' + + diff --git a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTitemMapper.xml b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTitemMapper.xml new file mode 100644 index 00000000..1a35bf52 --- /dev/null +++ b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTitemMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, + tichet_id, + item_name, + item_count, + item_unit, + item_price, + item_discount, + item_money, + repair_id, + repair_name, + sale_id, + sale_name, + item_type, + project_id, + part_id, + project_type_id, + part_type_id, + other_type_id, + item_status, + remark + from dl_repair_titem drti + where drti.deleted = '0' + +