出入库明细

sd-business/src/main/java/com/sd/business/controller/purchase/PurchaseController.java

@@ -0,0 +1,71 @@
+package com.sd.business.controller.purchase;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.purchase.dto.PurchaseDto;
+import com.sd.business.entity.purchase.dto.PurchaseSelectDto;
+import com.sd.business.entity.purchase.vo.PurchaseVo;
+import com.sd.business.service.purchase.PurchaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 采购合同 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@RestController
+@RequestMapping("/purchase")
+public class PurchaseController {
+
+    @Autowired
+    private PurchaseService purchaseService;
+
+    /**
+     * 采购合同分页
+     */
+    @PostMapping("/page")
+    public Page<PurchaseVo> page(@RequestBody PurchaseSelectDto dto) {
+        return purchaseService.getPage(dto);
+    }
+
+    /**
+     * 采购合同明细
+     */
+    @PostMapping("/detail")
+    public PurchaseVo detail(@RequestBody BaseSelectDto dto) {
+        return purchaseService.detail(dto.getId());
+    }
+
+    /**
+     * 采购合同新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody PurchaseDto purchaseDto) {
+        purchaseService.add(purchaseDto);
+    }
+
+    /**
+     * 采购合同编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody PurchaseDto purchaseDto) {
+        purchaseService.edit(purchaseDto);
+    }
+
+    /**
+     * 采购合同删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        purchaseService.delete(dto.getId());
+    }
+
+}

sd-business/src/main/java/com/sd/business/entity/in/dto/InOutStorageBomSelectDto.java

@@ -14,4 +14,39 @@ import lombok.Setter;
 @Setter
 public class InOutStorageBomSelectDto extends BaseSelectDto {
 
+    /**
+     * 出入库单号
+     */
+    private String code;
+
+    /**
+     * 采购单号
+     */
+    private String purchaseCode;
+
+    /**
+     * 产品规格品号
+     */
+    private String bomSpecCode;
+
+    /**
+     * 产品规格品名
+     */
+    private String bomSpecName;
+
+    /**
+     * 事业部id
+     */
+    private Long departmentId;
+
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+
+    /**
+     * 出入库明细
+     */
+    private Integer detailType;
+
 }

sd-business/src/main/java/com/sd/business/entity/in/po/InOutStorageBom.java

@@ -36,6 +36,7 @@ public class InOutStorageBom extends BasePo {
     /**
      * 数量
      */
+    @NotNull(message = "出入库数量不能为空")
     @DecimalMin(value = "0.01", message = "出入库数量必须大于0")
     private BigDecimal quantity;
 

sd-business/src/main/java/com/sd/business/entity/in/vo/InOutStorageBomVo.java

@@ -14,4 +14,49 @@ import lombok.Setter;
 @Setter
 public class InOutStorageBomVo extends InOutStorageBom {
 
+    /**
+     * 出入库明细
+     */
+    private Integer detailType;
+
+    /**
+     * 出入库单号
+     */
+    private String code;
+
+    /**
+     * 申请人
+     */
+    private String applicant;
+
+    /**
+     * 仓库类型 字典:warehouse_type
+     */
+    private String warehouseType;
+
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+
+    /**
+     * 事业部名称
+     */
+    private String departmentName;
+
+    /**
+     * 采购单号
+     */
+    private String purchaseCode;
+
+    /**
+     * 产品规格品号
+     */
+    private String bomSpecCode;
+
+    /**
+     * 产品规格品名
+     */
+    private String bomSpecName;
+
 }

sd-business/src/main/java/com/sd/business/entity/in/vo/InOutStorageVo.java

@@ -29,4 +29,9 @@ public class InOutStorageVo extends InOutStorage {
      */
     private String departmentName;
 
+    /**
+     * 采购单号
+     */
+    private String purchaseCode;
+
 }

sd-business/src/main/java/com/sd/business/entity/purchase/dto/PurchaseDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.purchase.dto;
+
+import com.sd.business.entity.purchase.po.Purchase;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 采购合同新增编辑入参实体
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class PurchaseDto extends Purchase {
+
+}

sd-business/src/main/java/com/sd/business/entity/purchase/dto/PurchaseSelectDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.purchase.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 采购合同列表查询入参实体
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class PurchaseSelectDto extends BaseSelectDto {
+
+}

sd-business/src/main/java/com/sd/business/entity/purchase/po/Purchase.java

@@ -0,0 +1,174 @@
+package com.sd.business.entity.purchase.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 采购合同
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+@TableName("purchase")
+public class Purchase extends BasePo {
+
+    /**
+     * 采购合同编号
+     */
+    private String code;
+
+    /**
+     * 申购单id
+     */
+    private Long applyBuyId;
+
+    /**
+     * 供应商id
+     */
+    private Long supplierId;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 详细地址
+     */
+    private String detailedAddress;
+
+    /**
+     * 联系人
+     */
+    private String contactPerson;
+
+    /**
+     * 联系人电话
+     */
+    private String contactNumber;
+
+    /**
+     * 收获类型 1供应商运输 2自取
+     */
+    private Integer receiveGoodsType;
+
+    /**
+     * 收货省
+     */
+    private String receiveProvince;
+
+    /**
+     * 收货市
+     */
+    private String receiveCity;
+
+    /**
+     * 收货详细地址
+     */
+    private String receiveDetailedAddress;
+
+    /**
+     * 收货邮编
+     */
+    private String receivePostcode;
+
+    /**
+     * 收货联系人
+     */
+    private String receiveContactPerson;
+
+    /**
+     * 收货联系人电话
+     */
+    private String receiveContactNumber;
+
+    /**
+     * 结算方式 字典:settlement_method
+     */
+    private String settlementMethod;
+
+    /**
+     * 发票类型 字典:invoice_type
+     */
+    private String invoiceType;
+
+    /**
+     * 交付日期
+     */
+    private Date deliveryDate;
+
+    /**
+     * 币种 字典:currency
+     */
+    private String currency;
+
+    /**
+     * 预付款（百分比）
+     */
+    private BigDecimal advancePayment;
+
+    /**
+     * 含税总金额
+     */
+    private BigDecimal totalAmountIncludingTax;
+
+    /**
+     * 不含税总金额
+     */
+    private BigDecimal totalAmountExcludingTax;
+
+    /**
+     * 合同模板id
+     */
+    private Long contractTemplateId;
+
+    /**
+     * 合同内容
+     */
+    private String contract;
+
+    /**
+     * 退货总金额
+     */
+    private BigDecimal returnAmount;
+
+    /**
+     * 已结清金额
+     */
+    private BigDecimal closedAccountAmount;
+
+    /**
+     * 已抵扣金额
+     */
+    private BigDecimal deductibleAmount;
+
+    /**
+     * 采购付款状态 0未结清 1已结清
+     */
+    private Integer paymentStatus;
+
+    /**
+     * 流程id
+     */
+    private Long flowId;
+
+    /**
+     * 流程状态 -1草稿  0未发起 1进行中 2已通过 3已驳回
+     */
+    private Integer flowStatus;
+
+}

sd-business/src/main/java/com/sd/business/entity/purchase/vo/PurchaseVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.purchase.vo;
+
+import com.sd.business.entity.purchase.po.Purchase;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 采购合同列表查询返回值实体
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class PurchaseVo extends Purchase {
+
+}

sd-business/src/main/java/com/sd/business/mapper/purchase/PurchaseMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.purchase;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.purchase.po.Purchase;
+import com.sd.business.entity.purchase.vo.PurchaseVo;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 采购合同 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+public interface PurchaseMapper extends BaseMapper<Purchase> {
+
+    /**
+     * 采购合同分页
+     */
+    Page<PurchaseVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Purchase> wrapper);
+
+}

sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageBomServiceImpl.java

@@ -4,10 +4,14 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.bom.po.BomSpec;
 import com.sd.business.entity.in.dto.InOutStorageBomDto;
 import com.sd.business.entity.in.dto.InOutStorageBomSelectDto;
+import com.sd.business.entity.in.po.InOutStorage;
 import com.sd.business.entity.in.po.InOutStorageBom;
 import com.sd.business.entity.in.vo.InOutStorageBomVo;
+import com.sd.business.entity.purchase.po.Purchase;
+import com.sd.business.entity.warehouse.po.Warehouse;
 import com.sd.business.mapper.in.InOutStorageBomMapper;
 import com.sd.business.service.in.InOutStorageBomService;
 import org.springframework.stereotype.Service;
@@ -28,6 +32,16 @@ public class InOutStorageBomServiceImpl extends ServiceImpl<InOutStorageBomMappe
     public Page<InOutStorageBomVo> getPage(InOutStorageBomSelectDto dto) {
         IWrapper<InOutStorageBom> wrapper = getWrapper();
         wrapper.orderByDesc("iosb", InOutStorageBom::getId);
+        wrapper.like("ios", InOutStorage::getCode, dto.getCode());
+        wrapper.like("p", Purchase::getCode, dto.getPurchaseCode());
+        wrapper.like("bs", BomSpec::getCode, dto.getBomSpecCode());
+        wrapper.like("bs", BomSpec::getName, dto.getBomSpecName());
+        wrapper.eq("ios", InOutStorage::getDepartmentId, dto.getDepartmentId());
+        wrapper.like("w", Warehouse::getName, dto.getWarehouseName());
+        wrapper.eq("ios", InOutStorage::getDetailType, dto.getDetailType());
+        wrapper.ge("ios", InOutStorage::getCreateTime, dto.getBeginTime());
+        wrapper.le("ios", InOutStorage::getCreateTime, dto.getEndTime());
+
         Page<InOutStorageBomVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }

sd-business/src/main/java/com/sd/business/service/purchase/PurchaseService.java

@@ -0,0 +1,46 @@
+package com.sd.business.service.purchase;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.purchase.dto.PurchaseDto;
+import com.sd.business.entity.purchase.dto.PurchaseSelectDto;
+import com.sd.business.entity.purchase.po.Purchase;
+import com.sd.business.entity.purchase.vo.PurchaseVo;
+
+
+/**
+ * <p>
+ * 采购合同 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+public interface PurchaseService extends BaseService<Purchase> {
+
+    /**
+     * 采购合同分页
+     */
+    Page<PurchaseVo> getPage(PurchaseSelectDto dto);
+
+    /**
+     * 采购合同明细
+     */
+    PurchaseVo detail(Long id);
+
+    /**
+     * 采购合同新增
+     */
+    void add(PurchaseDto purchaseDto);
+
+    /**
+     * 采购合同编辑
+     */
+    void edit(PurchaseDto purchaseDto);
+
+    /**
+     * 采购合同删除
+     */
+    void delete(Long id);
+
+}

sd-business/src/main/java/com/sd/business/service/purchase/impl/PurchaseServiceImpl.java

@@ -0,0 +1,57 @@
+package com.sd.business.service.purchase.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.purchase.dto.PurchaseDto;
+import com.sd.business.entity.purchase.dto.PurchaseSelectDto;
+import com.sd.business.entity.purchase.po.Purchase;
+import com.sd.business.entity.purchase.vo.PurchaseVo;
+import com.sd.business.mapper.purchase.PurchaseMapper;
+import com.sd.business.service.purchase.PurchaseService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 采购合同 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Service
+public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> implements PurchaseService {
+
+    @Override
+    public Page<PurchaseVo> getPage(PurchaseSelectDto dto) {
+        IWrapper<Purchase> wrapper = getWrapper();
+        wrapper.orderByDesc("p", Purchase::getId);
+        Page<PurchaseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public PurchaseVo detail(Long id) {
+        Purchase Purchase = this.getById(id);
+        PurchaseVo result = BeanUtil.toBean(Purchase, PurchaseVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(PurchaseDto purchaseDto) {
+        this.save(purchaseDto);
+    }
+
+    @Override
+    public void edit(PurchaseDto purchaseDto) {
+        this.updateById(purchaseDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

sd-business/src/main/resources/mapper/in/InOutStorageBomMapper.xml

@@ -1,16 +1,28 @@
 <?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.sd.business.mapper.in.InOutStorageBomMapper">
+
     <select id="getPage" resultType="com.sd.business.entity.in.vo.InOutStorageBomVo">
         select iosb.id,
                iosb.in_out_storage_id,
                iosb.bom_spec_id,
                iosb.quantity,
-               iosb.create_user,
-               iosb.create_time,
-               iosb.update_user,
-               iosb.update_time
+               ios.create_time,
+               w.type  warehouseType,
+               w.name  warehouseName,
+               d.name  departmentName,
+               p.code  purchaseCode,
+               ios.detail_type,
+               ios.code,
+               ios.applicant,
+               bs.code bomSpecCode,
+               bs.name bomSpecName
         from in_out_storage_bom iosb
+                 left join in_out_storage ios on iosb.in_out_storage_id = ios.id
+                 left join warehouse w on ios.warehouse_id = w.id
+                 left join department d on ios.department_id = d.id
+                 left join purchase p on ios.purchase_id = p.id
+                 left join bom_spec bs on iosb.bom_spec_id = bs.id
             ${ew.customSqlSegment}
     </select>
 

sd-business/src/main/resources/mapper/in/InOutStorageMapper.xml

@@ -6,20 +6,23 @@
                ios.type,
                ios.detail_type,
                ios.code,
-               ios.business_id,
-               ios.business_code,
+               ios.purchase_id,
                ios.warehouse_id,
                ios.department_id,
+               ios.applicant,
+               ios.remark,
                ios.create_user,
                ios.create_time,
                ios.update_user,
                ios.update_time,
                w.type warehouseType,
                w.name warehouseName,
-               d.name departmentName
+               d.name departmentName,
+               p.code purchaseCode
         from in_out_storage ios
                  left join warehouse w on ios.warehouse_id = w.id
                  left join department d on ios.department_id = d.id
+                 left join purchase p on ios.purchase_id = p.id
             ${ew.customSqlSegment}
     </select>
 

sd-business/src/main/resources/mapper/purchase/PurchaseMapper.xml

@@ -0,0 +1,44 @@
+<?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.sd.business.mapper.purchase.PurchaseMapper">
+    <select id="getPage" resultType="com.sd.business.entity.purchase.vo.PurchaseVo">
+        select p.id,
+               p.code,
+               p.apply_buy_id,
+               p.supplier_id,
+               p.province,
+               p.city,
+               p.detailed_address,
+               p.contact_person,
+               p.contact_number,
+               p.receive_goods_type,
+               p.receive_province,
+               p.receive_city,
+               p.receive_detailed_address,
+               p.receive_postcode,
+               p.receive_contact_person,
+               p.receive_contact_number,
+               p.settlement_method,
+               p.invoice_type,
+               p.delivery_date,
+               p.currency,
+               p.advance_payment,
+               p.total_amount_including_tax,
+               p.total_amount_excluding_tax,
+               p.contract_template_id,
+               p.contract,
+               p.return_amount,
+               p.closed_account_amount,
+               p.deductible_amount,
+               p.payment_status,
+               p.flow_id,
+               p.flow_status,
+               p.create_user,
+               p.create_time,
+               p.update_user,
+               p.update_time
+        from purchase p
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>