From 4576eaf1dff2e987514cd9b04c471389ba7c4ac2 Mon Sep 17 00:00:00 2001 From: chenhao Date: Wed, 26 Nov 2025 10:10:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(project):=20=E4=BC=98=E5=8C=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=B9=B6=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改项目详情按钮点击事件，支持编辑和查看两种模式 - 根据项目状态决定打开编辑表单或详情抽屉 - 在订单详情中自动填充当前用户信息 - 修复分页排序参数处理逻辑 - 添加项目创建时默认填充当前用户为支持人员 - 扩展用户状态管理，增加邮箱和电话号码字段 - 登录时同步存储用户邮箱和电话号码信息 --- oms_web/oms_vue/src/api/sip/purchaseorder.js | 44 ++ .../oms_vue/src/views/base/vendor/index.vue | 148 +++++- .../components/PurchaseOrderDetail.vue | 460 ++++++++++++++++++ .../oms_vue/src/views/purchaseorder/index.vue | 299 ++++++++++++ .../vue/OmsPurchaseOrderController.java | 98 ++++ .../ruoyi/sip/domain/OmsPurchaseOrder.java | 91 ++++ .../sip/domain/OmsPurchaseOrderItem.java | 57 +++ .../java/com/ruoyi/sip/domain/VendorInfo.java | 28 ++ .../ruoyi/sip/flowable/mapper/TodoMapper.java | 2 +- .../sip/mapper/OmsPurchaseOrderMapper.java | 91 ++++ .../sip/service/IOmsPurchaseOrderService.java | 61 +++ .../impl/OmsPurchaseOrderServiceImpl.java | 183 +++++++ .../mapper/system/VendorInfoMapper.xml | 42 ++ 13 files changed, 1599 insertions(+), 5 deletions(-) create mode 100644 oms_web/oms_vue/src/api/sip/purchaseorder.js create mode 100644 oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue create mode 100644 oms_web/oms_vue/src/views/purchaseorder/index.vue create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/OmsPurchaseOrderController.java create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderItem.java create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPurchaseOrderMapper.java create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPurchaseOrderService.java create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java diff --git a/oms_web/oms_vue/src/api/sip/purchaseorder.js b/oms_web/oms_vue/src/api/sip/purchaseorder.js new file mode 100644 index 00000000..ff351b2b --- /dev/null +++ b/oms_web/oms_vue/src/api/sip/purchaseorder.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询采购单主表列表 +export function listPurchaseorder(query) { + return request({ + url: '/sip/purchaseorder/list', + method: 'get', + params: query + }) +} + +// 查询采购单主表详细 +export function getPurchaseorder(id) { + return request({ + url: '/sip/purchaseorder/' + id, + method: 'get' + }) +} + +// 新增采购单主表 +export function addPurchaseorder(data) { + return request({ + url: '/sip/purchaseorder', + method: 'post', + data: data + }) +} + +// 修改采购单主表 +export function updatePurchaseorder(data) { + return request({ + url: '/sip/purchaseorder', + method: 'put', + data: data + }) +} + +// 删除采购单主表 +export function delPurchaseorder(id) { + return request({ + url: '/sip/purchaseorder/' + id, + method: 'delete' + }) +} diff --git a/oms_web/oms_vue/src/views/base/vendor/index.vue b/oms_web/oms_vue/src/views/base/vendor/index.vue index dbd01662..85110c9d 100644 --- a/oms_web/oms_vue/src/views/base/vendor/index.vue +++ b/oms_web/oms_vue/src/views/base/vendor/index.vue @@ -138,8 +138,8 @@ /> - - + + @@ -186,6 +186,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
确 定 @@ -218,6 +290,7 @@ diff --git a/oms_web/oms_vue/src/views/purchaseorder/index.vue b/oms_web/oms_vue/src/views/purchaseorder/index.vue new file mode 100644 index 00000000..235a4da7 --- /dev/null +++ b/oms_web/oms_vue/src/views/purchaseorder/index.vue @@ -0,0 +1,299 @@ + + + diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/OmsPurchaseOrderController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/OmsPurchaseOrderController.java new file mode 100644 index 00000000..66559fcd --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/OmsPurchaseOrderController.java @@ -0,0 +1,98 @@ +package com.ruoyi.sip.controller.vue; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.sip.domain.OmsPurchaseOrder; +import com.ruoyi.sip.service.IOmsPurchaseOrderService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 采购单主表Controller + * + * @author ruoyi + * @date 2025-11-24 + */ +@RestController +@RequestMapping("/sip/purchaseorder") +public class OmsPurchaseOrderController extends BaseController +{ + @Autowired + private IOmsPurchaseOrderService omsPurchaseOrderService; + + /** + * 查询采购单主表列表 + */ + @RequiresPermissions("sip:purchaseorder:list") + @GetMapping("/list") + public TableDataInfo list(OmsPurchaseOrder omsPurchaseOrder) + { + startPage(); + List list = omsPurchaseOrderService.selectOmsPurchaseOrderList(omsPurchaseOrder); + return getDataTable(list); + } + + /** + * 导出采购单主表列表 + */ + @RequiresPermissions("sip:purchaseorder:export") + @Log(title = "采购单主表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, OmsPurchaseOrder omsPurchaseOrder) + { + List list = omsPurchaseOrderService.selectOmsPurchaseOrderList(omsPurchaseOrder); + ExcelUtil util = new ExcelUtil(OmsPurchaseOrder.class); + util.exportExcel(response, list, "采购单主表数据"); + } + + /** + * 获取采购单主表详细信息 + */ + @RequiresPermissions("sip:purchaseorder:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(omsPurchaseOrderService.selectOmsPurchaseOrderById(id)); + } + + /** + * 新增采购单主表 + */ + @RequiresPermissions("sip:purchaseorder:add") + @Log(title = "采购单主表", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody OmsPurchaseOrder omsPurchaseOrder) + { + return toAjax(omsPurchaseOrderService.insertOmsPurchaseOrder(omsPurchaseOrder)); + } + + /** + * 修改采购单主表 + */ + @RequiresPermissions("sip:purchaseorder:edit") + @Log(title = "采购单主表", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody OmsPurchaseOrder omsPurchaseOrder) + { + return toAjax(omsPurchaseOrderService.updateOmsPurchaseOrder(omsPurchaseOrder)); + } + + /** + * 删除采购单主表 + */ + @RequiresPermissions("sip:purchaseorder:remove") + @Log(title = "采购单主表", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(omsPurchaseOrderService.deleteOmsPurchaseOrderByIds(ids)); + } +} diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java new file mode 100644 index 00000000..877c2730 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java @@ -0,0 +1,91 @@ +package com.ruoyi.sip.domain; + +import java.math.BigDecimal; +import java.util.List; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.ToString; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 采购单主表对象 oms_purchase_order + * + * @author ruoyi + * @date 2025-11-24 + */ +@Data +@ToString +public class OmsPurchaseOrder extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 采购单号（系统生成） */ + private String purchaseNo; + + /** 采购方名称 */ + private String buyerName; + + /** 采购方地址 */ + private String buyerAddress; + + /** 制造商ID */ + private Long vendorId; + + private String vendorName; + private String vendorUser; + private String vendorPhone; + /** 币别（固定人民币） */ + private String currency; + + /** 采购员ID */ + private Long purchaserId; + + + /** 采购员姓名 */ + private String purchaserName; + + /** 采购员电话 */ + private String purchaserMobile; + + /** 采购员邮箱 */ + private String purchaserEmail; + + /** 入库仓库ID */ + private Long warehouseId; + + /** 付款方式 */ + private String payMethod; + + /** 汇智负责人ID */ + private Long ownerId; + + /** 汇智负责人姓名 */ + private String ownerName; + + /** 含税总金额 */ + private BigDecimal totalAmount; + + /** 采购状态（0待入库 1部分入库 2已完成） */ + private Integer status; + + /** 审批状态（0草稿 1审批中 2已通过 3驳回） */ + private Integer approveStatus; + + /** 当前审批节点 */ + private String approveNode; + + /** 确认状态（0待确认 1已确认） */ + private Integer confirmStatus; + + /** 删除标志（0正常 1删除） */ + private Integer delFlag; + + /** 采购单明细表信息 */ + private List omsPurchaseOrderItemList; + + +} diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderItem.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderItem.java new file mode 100644 index 00000000..2b051976 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderItem.java @@ -0,0 +1,57 @@ +package com.ruoyi.sip.domain; + +import java.math.BigDecimal; +import java.util.Date; + +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.ToString; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * 采购单明细表对象 oms_purchase_order_item + * + * @author ruoyi + * @date 2025-11-24 + */ +@Data +@ToString +public class OmsPurchaseOrderItem extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 关联采购单ID */ + private Long purchaseId; + + /** 产品CODE */ + private String productCode; + + /** 0:待入库 1:已完成 */ + private Long innerStatus; + + /** 数量 */ + private BigDecimal quantity; + + /** 单价 */ + private BigDecimal price; + + /** 税率百分比 */ + private BigDecimal taxRate; + + /** 税额 */ + private BigDecimal taxTotal; + + /** 含税金额 */ + private BigDecimal amountTotal; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date deliveryDate; + private String productType; + private String productModel; + private String productDescription; + +} diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/VendorInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/VendorInfo.java index 02b9a15d..c0bfe74f 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/VendorInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/VendorInfo.java @@ -62,6 +62,34 @@ public class VendorInfo extends BaseEntity private String warehouseId; private String ownWarehouseId; + //付款方式 + private Integer payType; + //付款配置天数 + private Integer payConfigDay; + //账户名称 + private String payName; + //银行卡号 + private String payBankNumber; + //开户行 + private String payBankOpenAddress; + //银行行号 + private String bankNumber; + //统一社会信用代码 + private String socialCredit; + + /** 省份 */ + @Excel(name = "省份") + private String province; + + /** 城市 */ + @Excel(name = "城市") + private String city; + + /** 生成地址 */ + @Excel(name = "生成地址") + private String generatedAddress; + + @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) private List warehouseIdList; diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/flowable/mapper/TodoMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/flowable/mapper/TodoMapper.java index 3781e5ee..13abf766 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/flowable/mapper/TodoMapper.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/flowable/mapper/TodoMapper.java @@ -3,7 +3,7 @@ package com.ruoyi.sip.flowable.mapper; import com.ruoyi.sip.flowable.domain.Todo; -import com.sun.xml.internal.bind.v2.TODO; + import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPurchaseOrderMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPurchaseOrderMapper.java new file mode 100644 index 00000000..fb4245ba --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPurchaseOrderMapper.java @@ -0,0 +1,91 @@ +package com.ruoyi.sip.mapper; + +import java.util.List; +import com.ruoyi.sip.domain.OmsPurchaseOrder; +import com.ruoyi.sip.domain.OmsPurchaseOrderItem; + +/** + * 采购单主表Mapper接口 + * + * @author ruoyi + * @date 2025-11-24 + */ +public interface OmsPurchaseOrderMapper +{ + /** + * 查询采购单主表 + * + * @param id 采购单主表主键 + * @return 采购单主表 + */ + public OmsPurchaseOrder selectOmsPurchaseOrderById(Long id); + + /** + * 查询采购单主表列表 + * + * @param omsPurchaseOrder 采购单主表 + * @return 采购单主表集合 + */ + public List selectOmsPurchaseOrderList(OmsPurchaseOrder omsPurchaseOrder); + + /** + * 新增采购单主表 + * + * @param omsPurchaseOrder 采购单主表 + * @return 结果 + */ + public int insertOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder); + + /** + * 修改采购单主表 + * + * @param omsPurchaseOrder 采购单主表 + * @return 结果 + */ + public int updateOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder); + + /** + * 删除采购单主表 + * + * @param id 采购单主表主键 + * @return 结果 + */ + public int deleteOmsPurchaseOrderById(Long id); + + /** + * 批量删除采购单主表 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteOmsPurchaseOrderByIds(Long[] ids); + + /** + * 批量删除采购单明细表 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteOmsPurchaseOrderItemByPurchaseIds(Long[] ids); + + /** + * 批量新增采购单明细表 + * + * @param omsPurchaseOrderItemList 采购单明细表列表 + * @return 结果 + */ + public int batchOmsPurchaseOrderItem(List omsPurchaseOrderItemList); + + + /** + * 通过采购单主表主键删除采购单明细表信息 + * + * @param id 采购单主表ID + * @return 结果 + */ + public int deleteOmsPurchaseOrderItemByPurchaseId(Long id); + + int selectMaxOrderCode(String string); + + List listItemByPurchaseId(Long id); +} diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPurchaseOrderService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPurchaseOrderService.java new file mode 100644 index 00000000..fec89318 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPurchaseOrderService.java @@ -0,0 +1,61 @@ +package com.ruoyi.sip.service; + +import java.util.List; +import com.ruoyi.sip.domain.OmsPurchaseOrder; + +/** + * 采购单主表Service接口 + * + * @author ruoyi + * @date 2025-11-24 + */ +public interface IOmsPurchaseOrderService +{ + /** + * 查询采购单主表 + * + * @param id 采购单主表主键 + * @return 采购单主表 + */ + public OmsPurchaseOrder selectOmsPurchaseOrderById(Long id); + + /** + * 查询采购单主表列表 + * + * @param omsPurchaseOrder 采购单主表 + * @return 采购单主表集合 + */ + public List selectOmsPurchaseOrderList(OmsPurchaseOrder omsPurchaseOrder); + + /** + * 新增采购单主表 + * + * @param omsPurchaseOrder 采购单主表 + * @return 结果 + */ + public int insertOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder); + + /** + * 修改采购单主表 + * + * @param omsPurchaseOrder 采购单主表 + * @return 结果 + */ + public int updateOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder); + + /** + * 批量删除采购单主表 + * + * @param ids 需要删除的采购单主表主键集合 + * @return 结果 + */ + public int deleteOmsPurchaseOrderByIds(Long[] ids); + + /** + * 删除采购单主表信息 + * + * @param id 采购单主表主键 + * @return 结果 + */ + public int deleteOmsPurchaseOrderById(Long id); +} diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java new file mode 100644 index 00000000..3ffa6a36 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java @@ -0,0 +1,183 @@ +package com.ruoyi.sip.service.impl; + +import java.util.List; + +import cn.hutool.core.collection.CollUtil; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.sip.domain.Cnarea; +import com.ruoyi.sip.domain.VendorInfo; +import com.ruoyi.sip.service.ICnareaService; +import com.ruoyi.sip.service.IVendorInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.ArrayList; +import com.ruoyi.common.utils.StringUtils; +import org.springframework.transaction.annotation.Transactional; +import com.ruoyi.sip.domain.OmsPurchaseOrderItem; +import com.ruoyi.sip.mapper.OmsPurchaseOrderMapper; +import com.ruoyi.sip.domain.OmsPurchaseOrder; +import com.ruoyi.sip.service.IOmsPurchaseOrderService; + +import javax.annotation.Resource; + +/** + * 采购单主表Service业务层处理 + * + * @author ruoyi + * @date 2025-11-24 + */ +@Service +public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService +{ + @Resource + private OmsPurchaseOrderMapper omsPurchaseOrderMapper; + @Autowired + private ICnareaService cnareaService; + @Autowired + private IVendorInfoService vendorInfoService; + /** + * 查询采购单主表 + * + * @param id 采购单主表主键 + * @return 采购单主表 + */ + @Override + public OmsPurchaseOrder selectOmsPurchaseOrderById(Long id) + { + OmsPurchaseOrder omsPurchaseOrder = omsPurchaseOrderMapper.selectOmsPurchaseOrderById(id); + List omsPurchaseOrderItems = omsPurchaseOrderMapper.listItemByPurchaseId(id); + omsPurchaseOrder.setOmsPurchaseOrderItemList(omsPurchaseOrderItems); + + return omsPurchaseOrder; + } + + /** + * 查询采购单主表列表 + * + * @param omsPurchaseOrder 采购单主表 + * @return 采购单主表 + */ + @Override + public List selectOmsPurchaseOrderList(OmsPurchaseOrder omsPurchaseOrder) + { + return omsPurchaseOrderMapper.selectOmsPurchaseOrderList(omsPurchaseOrder); + } + + /** + * 新增采购单主表 + * + * @param omsPurchaseOrder 采购单主表 + * @return 结果 + */ + @Transactional + @Override + public int insertOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder) + { + omsPurchaseOrder.setCreateTime(DateUtils.getNowDate()); + omsPurchaseOrder.setPurchaseNo(generatePurchaseNo(omsPurchaseOrder.getVendorId())); + int rows = omsPurchaseOrderMapper.insertOmsPurchaseOrder(omsPurchaseOrder); + insertOmsPurchaseOrderItem(omsPurchaseOrder); + return rows; + } + + /** + * 生成订单编号 + * + * @param province 省份代码 + * @return 订单编号 + */ + + private String generatePurchaseNo(Long vendorId) { + VendorInfo vendorInfo = vendorInfoService.selectVendorInfoByVendorId(vendorId); + if (vendorInfo==null || StringUtils.isEmpty(vendorInfo.getProvince())) { + throw new ServiceException("制造商所属省为空,无法生成订单编号"); + } + // 获取当前时间，格式为yyyyMMdd + String currentDate = DateUtils.dateTimeNow("yyyyMMdd"); + Cnarea cnarea = new Cnarea(); + cnarea.setName(vendorInfo.getProvince()); + cnarea.setLevel("1"); + List cnareas = cnareaService.queryAll(cnarea); + if (CollUtil.isEmpty(cnareas)) { + throw new ServiceException("省市未配置,生成订单编号出错,请联系管理员"); + } + String shortCode = cnareas.get(0).getShortCode(); + StringBuilder result = new StringBuilder(); + result.append("ZGCV-").append(currentDate).append(shortCode); + // 查询当天已有的订单数量，用于生成顺序编码 + int count = omsPurchaseOrderMapper.selectMaxOrderCode(result.toString()); + // 生成顺序编码，不足三位补零 + String sequence = String.format("%03d", count + 1); + result.append(sequence); + // 拼接订单编号 + return result.toString(); + } + /** + * 修改采购单主表 + * + * @param omsPurchaseOrder 采购单主表 + * @return 结果 + */ + @Transactional + @Override + public int updateOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder) + { + omsPurchaseOrder.setUpdateTime(DateUtils.getNowDate()); + omsPurchaseOrderMapper.deleteOmsPurchaseOrderItemByPurchaseId(omsPurchaseOrder.getId()); + insertOmsPurchaseOrderItem(omsPurchaseOrder); + return omsPurchaseOrderMapper.updateOmsPurchaseOrder(omsPurchaseOrder); + } + + /** + * 批量删除采购单主表 + * + * @param ids 需要删除的采购单主表主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteOmsPurchaseOrderByIds(Long[] ids) + { + omsPurchaseOrderMapper.deleteOmsPurchaseOrderItemByPurchaseIds(ids); + return omsPurchaseOrderMapper.deleteOmsPurchaseOrderByIds(ids); + } + + /** + * 删除采购单主表信息 + * + * @param id 采购单主表主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteOmsPurchaseOrderById(Long id) + { + omsPurchaseOrderMapper.deleteOmsPurchaseOrderItemByPurchaseId(id); + return omsPurchaseOrderMapper.deleteOmsPurchaseOrderById(id); + } + + /** + * 新增采购单明细表信息 + * + * @param omsPurchaseOrder 采购单主表对象 + */ + public void insertOmsPurchaseOrderItem(OmsPurchaseOrder omsPurchaseOrder) + { + List omsPurchaseOrderItemList = omsPurchaseOrder.getOmsPurchaseOrderItemList(); + Long id = omsPurchaseOrder.getId(); + if (StringUtils.isNotNull(omsPurchaseOrderItemList)) + { + List list = new ArrayList(); + for (OmsPurchaseOrderItem omsPurchaseOrderItem : omsPurchaseOrderItemList) + { + omsPurchaseOrderItem.setPurchaseId(id); + list.add(omsPurchaseOrderItem); + } + if (list.size() > 0) + { + omsPurchaseOrderMapper.batchOmsPurchaseOrderItem(list); + } + } + } +} diff --git a/ruoyi-sip/src/main/resources/mapper/system/VendorInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/system/VendorInfoMapper.xml index 114d0767..113ea26e 100644 --- a/ruoyi-sip/src/main/resources/mapper/system/VendorInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/system/VendorInfoMapper.xml @@ -17,11 +17,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + select t1.vendor_id, t1.vendor_code, t1.vendor_name, t1.vendor_address, t1.vendor_user, t1.vendor_email, t1.vendor_phone, t1.vendor_status , t1.create_by, t1.update_by, t1.create_time, t1.update_time,t1.warehouse_id,t1.own_warehouse_id + , t1.pay_type, t1.pay_config_day, t1.social_credit, t1.pay_name, t1.pay_bank_number, t1.pay_bank_open_address, t1.bank_number + , t1.province, t1.city, t1.generated_address ,t2.warehouse_name from oms_vendor_info t1 left join oms_warehouse_info t2 on t1.warehouse_id = t2.id @@ -65,6 +77,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, create_time, update_time, + pay_type, + pay_config_day, + social_credit, + pay_name, + pay_bank_number, + pay_bank_open_address, + bank_number, + province, + city, + generated_address, #{vendorId}, @@ -81,6 +103,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{createTime}, #{updateTime}, + #{payType}, + #{payConfigDay}, + #{socialCredit}, + #{payName}, + #{payBankNumber}, + #{payBankOpenAddress}, + #{bankNumber}, + #{province}, + #{city}, + #{generatedAddress}, @@ -100,6 +132,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, create_time = #{createTime}, update_time = #{updateTime}, + pay_type = #{payType}, + pay_config_day = #{payConfigDay}, + social_credit = #{socialCredit}, + pay_name = #{payName}, + pay_bank_number = #{payBankNumber}, + pay_bank_open_address = #{payBankOpenAddress}, + bank_number = #{bankNumber}, + province = #{province}, + city = #{city}, + generated_address = #{generatedAddress}, where vendor_id = #{vendorId}