Merge remote-tracking branch 'origin/master'

hx-common/code-generator/src/main/java/com/fjhx/modular/Victoriatourist.java

@@ -12,7 +12,7 @@ public class Victoriatourist {
         CodeGenerator.MODULAR_NAME = "victoriatourist";
 
         // 需要生成的表名称,多表用,隔开
-        CodeGenerator.INCLUDE = "product_spu";
+        CodeGenerator.INCLUDE = "apply_purchase";
 
         // mysql连接
         CodeGenerator.MYSQL_URL = "36.134.91.96:17330";

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/apply/ApplyPurchase.java

@@ -0,0 +1,135 @@
+package com.fjhx.entity.apply;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.fjhx.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 申购单
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ApplyPurchase extends BaseEntity {
+
+
+    /**
+     * 申购单号
+     */
+    private String code;
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 订单号
+     */
+    private String orderCode;
+
+    /**
+     * 供应商id
+     */
+    private Long supplierId;
+
+    /**
+     * 供应商账期/天
+     */
+    private Integer accountPeriod;
+
+    /**
+     * 物品id
+     */
+    private Long goodsId;
+
+    /**
+     * 申购数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 到货数量
+     */
+    private BigDecimal arrivalQuantity;
+
+    /**
+     * 单价
+     */
+    private BigDecimal unitPrice;
+
+    /**
+     * 申购金额
+     */
+    private BigDecimal applyPrice;
+
+    /**
+     * 到货金额
+     */
+    private BigDecimal arrivalPrice;
+
+    /**
+     * 要求到货时间
+     */
+    private Date planArrivalTime;
+
+    /**
+     * 收货仓库ID
+     */
+    private Long receiptWarehouseId;
+
+    /**
+     * 申购状态 1待发起 2审批中 3未通过 4已通过/待采购 5采购审批中 6已采购 7部分到货 8全部到货/结束 9已作废
+     */
+    private Integer status;
+
+    /**
+     * 完成状态 0未完成 1已完成
+     */
+    private Integer completeStatus;
+
+    /**
+     * 流程ID
+     */
+    private Long flowId;
+
+    /**
+     * 当前节点审批人ID
+     */
+    private Long flowApproverId;
+
+    /**
+     * 当前节点审批人名称
+     */
+    private String flowApproverName;
+
+    /**
+     * 申购原因
+     */
+    private String cause;
+
+    /**
+     * 采购备注
+     */
+    private String remark;
+
+    /**
+     * 乐观锁
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Version
+    private Integer version;
+
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/apply/ApplyPurchaseEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.apply;
+
+import com.fjhx.entity.apply.ApplyPurchase;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 申购单
+ *
+ * @author ${author}
+ * @since 2022-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ApplyPurchaseEx extends ApplyPurchase {
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/apply/ApplyPurchaseVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.apply;
+
+import com.fjhx.entity.apply.ApplyPurchase;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 申购单
+ *
+ * @author ${author}
+ * @since 2022-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ApplyPurchaseVo extends ApplyPurchase {
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/controller/apply/ApplyPurchaseController.java

@@ -0,0 +1,56 @@
+package com.fjhx.controller.apply;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.core.tool.api.R;
+import com.fjhx.entity.apply.ApplyPurchase;
+import com.fjhx.params.apply.ApplyPurchaseVo;
+import com.fjhx.service.apply.ApplyPurchaseService;
+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;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 申购单 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-28
+ */
+@RestController
+@RequestMapping("/applyPurchase")
+public class ApplyPurchaseController {
+
+    @Autowired
+    private ApplyPurchaseService applyPurchaseService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, Object> condition){
+        Page<ApplyPurchase> result = applyPurchaseService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody ApplyPurchaseVo applyPurchaseVo){
+        applyPurchaseService.add(applyPurchaseVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody ApplyPurchaseVo applyPurchaseVo){
+        applyPurchaseService.edit(applyPurchaseVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody ApplyPurchaseVo applyPurchaseVo){
+        applyPurchaseService.delete(applyPurchaseVo);
+        return R.success();
+    }
+
+}
+

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/apply/ApplyPurchaseMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.apply;
+
+import com.fjhx.entity.apply.ApplyPurchase;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 申购单 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-28
+ */
+public interface ApplyPurchaseMapper extends BaseMapper<ApplyPurchase> {
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/apply/ApplyPurchaseMapper.xml

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

hx-service/victoriatourist/src/main/java/com/fjhx/service/apply/ApplyPurchaseService.java

@@ -0,0 +1,28 @@
+package com.fjhx.service.apply;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.apply.ApplyPurchase;
+import com.fjhx.params.apply.ApplyPurchaseVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 申购单 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-28
+ */
+public interface ApplyPurchaseService extends BaseService<ApplyPurchase> {
+
+    Page<ApplyPurchase> getPage(Map<String, Object> condition);
+
+    void add(ApplyPurchaseVo applyPurchaseVo);
+
+    void edit(ApplyPurchaseVo applyPurchaseVo);
+
+    void delete(ApplyPurchaseVo applyPurchaseVo);
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/service/apply/impl/ApplyPurchaseServiceImpl.java

@@ -0,0 +1,48 @@
+package com.fjhx.service.apply.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.apply.ApplyPurchase;
+import com.fjhx.params.apply.ApplyPurchaseVo;
+import com.fjhx.mapper.apply.ApplyPurchaseMapper;
+import com.fjhx.service.apply.ApplyPurchaseService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 申购单 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-28
+ */
+@Service
+public class ApplyPurchaseServiceImpl extends ServiceImpl<ApplyPurchaseMapper, ApplyPurchase> implements ApplyPurchaseService {
+
+    @Override
+    public Page<ApplyPurchase> getPage(Map<String, Object> condition) {
+
+        IWrapper<ApplyPurchase> wrapper = IWrapper.getWrapper(condition);
+
+        return page(condition, wrapper);
+    }
+
+    @Override
+    public void add(ApplyPurchaseVo applyPurchaseVo) {
+        save(applyPurchaseVo);
+    }
+
+    @Override
+    public void edit(ApplyPurchaseVo applyPurchaseVo) {
+        updateById(applyPurchaseVo);
+    }
+
+    @Override
+    public void delete(ApplyPurchaseVo applyPurchaseVo) {
+        removeById(applyPurchaseVo.getId());
+    }
+
+}