客户、供应商基础增删查改导出接口编写

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/org/OrgController.java

@@ -2,14 +2,19 @@ package com.ruoyi.web.controller.warewms.org;
 
 import com.ruoyi.ams.bionutrition.org.bean.dto.OrgDTO;
 import com.ruoyi.ams.bionutrition.org.service.IOrgSevice;
+import com.ruoyi.base.constant.type.BizEnum;
+import com.ruoyi.base.domain.BaseCustomer;
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -26,9 +31,18 @@ public class OrgController extends BaseController {
     @Autowired
     private IOrgSevice orgSevice;
 
+    /**
+     * 获取客户/供应商详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('base:customer:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(orgSevice.selectOrgById(id));
+    }
 
     /**
-     * 查询入库单列表
+     * 查询客户/供应商列表
      */
     @PreAuthorize("@ss.hasPermi('docAsn:docAsn:list')")
     @GetMapping("/list")
@@ -38,6 +52,64 @@ public class OrgController extends BaseController {
         return getDataTable(orgList);
     }
 
+    /**
+     * 新增客户/供应商
+     */
+    @PreAuthorize("@ss.hasPermi('base:customer:add')")
+    @Log(title = "客户/供应商", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OrgDTO OrgDTO)
+    {
+        return toAjax(orgSevice.insertOrg(OrgDTO));
+    }
+
+    /**
+     * 修改客户/供应商
+     */
+    @PreAuthorize("@ss.hasPermi('base:customer:edit')")
+    @Log(title = "客户/供应商", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OrgDTO OrgDTO)
+    {
+        return toAjax(orgSevice.updateOrg(OrgDTO));
+    }
+
+    /**
+     * 删除客户/供应商
+     */
+    @PreAuthorize("@ss.hasPermi('base:customer:remove')")
+    @Log(title = "客户/供应商", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(orgSevice.deleteOrgByIds(ids));
+    }
 
+    /**
+     * 获取客户/供应商信息字典
+     */
+    @GetMapping("queryDict")
+    public AjaxResult queryDict(OrgDTO orgDTO)
+    {
+        return AjaxResult.success(orgSevice.getOrgDTOList(orgDTO));
+    }
+
+    /**
+     * 导出客户/供应商列表
+     */
+    @PreAuthorize("@ss.hasPermi('base:customer:export')")
+    @Log(title = "客户/供应商", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, OrgDTO orgDTO)
+    {
+        List<OrgDTO> orgDTOList = orgSevice.getOrgDTOList(orgDTO);
+        ExcelUtil<OrgDTO> util = new ExcelUtil<>(OrgDTO.class);
+        if (orgDTO.getOrgType().equals(BizEnum.OrgType.CUSTOMER.getCode())){
+            util.exportExcel(response,orgDTOList,"客户数据","客户数据");
+        }else {
+            util.exportExcel(response,orgDTOList,"供应商数据","供应商数据");
+        }
+
+    }
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/bean/dto/WarewmsExtDTO.java

@@ -10,7 +10,7 @@ public class WarewmsExtDTO extends WarewmsDTO {
 
     private static final long serialVersionUID = 972168161325170489L;
 
-    private Long id;
+    private String id;
 
     private Long creator;
 

ruoyi-common/src/main/java/com/ruoyi/common/core/bean/entity/WarewmsExtEntity.java

@@ -19,16 +19,16 @@ public class WarewmsExtEntity extends WarewmsEntity {
     @TableId
     private String id;
 
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(value = "create_by",fill = FieldFill.INSERT)
     private String creator;
 
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(value = "create_time",fill = FieldFill.INSERT)
     private Date createDate;
 
-    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @TableField(value = "update_by",fill = FieldFill.INSERT_UPDATE)
     private String updater;
 
-    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
     private Date updateDate;
 
     private String remark;

ruoyi-ui/src/api/base/customer.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询客户列表
 export function listCustomer(query) {
   return request({
-    url: '/base/customer/list',
+    url: '/base/org/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listCustomer(query) {
 // 查询客户详细
 export function getCustomer(customerId) {
   return request({
-    url: '/base/customer/' + customerId,
+    url: '/base/org/' + customerId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getCustomer(customerId) {
 // 新增客户
 export function addCustomer(data) {
   return request({
-    url: '/base/customer',
+    url: '/base/org',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addCustomer(data) {
 // 修改客户
 export function updateCustomer(data) {
   return request({
-    url: '/base/customer',
+    url: '/base/org',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateCustomer(data) {
 // 删除客户
 export function delCustomer(customerId) {
   return request({
-    url: '/base/customer/' + customerId,
+    url: '/base/org/' + customerId,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delCustomer(customerId) {
 // 查询供应商信息字典
 export function queryCustomerDict() {
   return request({
-    url: '/base/customer/queryDict',
+    url: '/base/org/queryDict',
     method: 'get',
   })
 }

ruoyi-ui/src/views/base/customer/index.vue

@@ -3,15 +3,15 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="名称" prop="customerName">
         <el-input
-          v-model="queryParams.customerName"
+          v-model="queryParams.orgName"
           placeholder="请输入名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
+      <el-form-item label="状态" prop="orgStatus">
+        <el-select v-model="queryParams.orgStatus" placeholder="请选择状态" clearable size="small">
           <el-option
             v-for="dict in dict.type.sys_normal_disable"
             :key="dict.value"
@@ -74,11 +74,11 @@
 
     <el-table v-loading="loading" :data="customerList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="customerId" />
-      <el-table-column label="名称" align="center" prop="customerName" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="名称" align="center" prop="orgName" />
+      <el-table-column label="状态" align="center" prop="orgStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.orgStatus"/>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
@@ -106,7 +106,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -119,10 +119,10 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="名称" prop="customerName">
-          <el-input v-model="form.customerName" placeholder="请输入名称" />
+          <el-input v-model="form.orgName" placeholder="请输入名称" />
         </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="form.status" placeholder="请选择状态">
+        <el-form-item label="状态" prop="orgStatus">
+          <el-select v-model="form.orgStatus" placeholder="请选择状态">
             <el-option
               v-for="dict in dict.type.sys_normal_disable"
               :key="dict.value"
@@ -188,8 +188,9 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        customerName: null,
-        status: null,
+        orgName: null,
+        orgStatus: null,
+        orgType: "10"// 客户
       },
       // 表单参数
       form: {},
@@ -219,9 +220,9 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        customerId: null,
-        customerName: null,
-        status: null,
+        id: null,
+        orgName: null,
+        orgStatus: null,
         createBy: null,
         createTime: null,
         updateBy: null,
@@ -231,7 +232,8 @@ export default {
         userdefine2: null,
         userdefine3: null,
         userdefine4: null,
-        userdefine5: null
+        userdefine5: null,
+        orgType: "10"//客户
       };
       this.resetForm("form");
     },
@@ -247,7 +249,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.customerId)
+      this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -260,8 +262,9 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const customerId = row.customerId || this.ids
-      getCustomer(customerId).then(response => {
+      const id = row.id || this.ids
+      console.log(id)
+      getCustomer(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改客户";
@@ -271,7 +274,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.customerId != null) {
+          if (this.form.id != null) {
             updateCustomer(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -289,9 +292,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const customerIds = row.customerId || this.ids;
-      this.$modal.confirm('是否确认删除客户编号为"' + customerIds + '"的数据项？').then(function() {
-        return delCustomer(customerIds);
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除客户编号为"' + ids + '"的数据项？').then(function() {
+        return delCustomer(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
@@ -299,7 +302,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('base/customer/export', {
+      this.download('base/org/export', {
         ...this.queryParams
       }, `customer_${new Date().getTime()}.xlsx`)
     }

ruoyi-ui/src/views/base/supplier/index.vue

@@ -267,6 +267,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const supplierId = row.supplierId || this.ids
+      console.log(supplierId)
       getSupplier(supplierId).then(response => {
         this.form = response.data;
         this.open = true;

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/org/bean/dto/OrgDTO.java

@@ -1,7 +1,10 @@
 package com.ruoyi.ams.bionutrition.org.bean.dto;
 
+import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.bean.dto.WarewmsExtDTO;
+import lombok.Data;
 
+@Data
 public class OrgDTO extends WarewmsExtDTO {
     private static final long serialVersionUID = -5857432637699543656L;
 
@@ -13,6 +16,7 @@ public class OrgDTO extends WarewmsExtDTO {
     /**
      * 客户/供应商全称
      */
+    @Excel(name = "名称")
     private String orgName;
 
     /**
@@ -23,32 +27,37 @@ public class OrgDTO extends WarewmsExtDTO {
     /**
      * 通信地址
      */
+    @Excel(name = "通信地址")
     private String orgAddress;
 
     /**
      * 联系人
      */
+    @Excel(name = "联系人")
     private String orgContacts;
 
 
     /**
      * 联系电话
      */
+    @Excel(name = "联系电话")
     private String orgPhoneNum;
 
     /**
      * 开户行
      */
+    @Excel(name = "开户行")
     private String orgAccountsBank;
 
     /**
      * 企业统一代码
      */
+    @Excel(name = "企业统一代码")
     private String orgCreditCode;
 
 
     /**
-     * 组织类型 00客户，10供应商
+     * 组织类型 10客户，00供应商
      * @see com.ruoyi.base.constant.type.BizEnum.OrgType#getCode()
      */
     private String orgType;

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/org/bean/entity/OrgEntity.java

@@ -1,5 +1,7 @@
 package com.ruoyi.ams.bionutrition.org.bean.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.bean.entity.WarewmsExtEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -7,6 +9,7 @@ import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
+@TableName("base_servicer")
 public class OrgEntity extends WarewmsExtEntity {
 
     private static final long serialVersionUID = 4779952752594209822L;
@@ -14,51 +17,60 @@ public class OrgEntity extends WarewmsExtEntity {
     /**
      * 客户/供应商编码
      */
+    @TableField(value = "org_code")
     private String orgCode;
 
     /**
      * 客户/供应商全称
      */
+    @TableField(value = "org_name")
     private String orgName;
 
-     /**
+    /**
      * 客户/供应商状态 1-启动 0-停用
      */
+    @TableField(value = "org_status")
     private String orgStatus;
 
     /**
      * 通信地址
      */
+    @TableField(value = "org_address")
     private String orgAddress;
 
     /**
      * 联系人
      */
+    @TableField(value = "org_contacts")
     private String orgContacts;
 
 
     /**
      * 联系电话
      */
+    @TableField(value = "org_phone")
     private String orgPhoneNum;
 
     /**
      * 开户行
      */
+    @TableField(value = "org_deposit_bank")
     private String orgAccountsBank;
 
     /**
      * 企业统一代码
      */
+    @TableField(value = "org_unified_code")
     private String orgCreditCode;
 
 
     /**
      * 组织类型 00客户，10供应商
+     *
      * @see com.ruoyi.base.constant.type.BizEnum.OrgType#getCode()
      */
+    @TableField(value = "org_servicer_type")
     private String orgType;
 
 
-
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/org/service/IOrgSevice.java

@@ -13,4 +13,32 @@ public interface IOrgSevice extends CrudService<OrgEntity, OrgDTO> {
      * @author
      */
     List<OrgDTO> getOrgDTOList(OrgDTO orgDTO);
+
+    /**
+     * 添加客户/供应商
+     * @param orgDTO
+     * @return
+     */
+    int insertOrg(OrgDTO orgDTO);
+
+    /**
+     * 修改客户/供应商
+     * @param orgDTO
+     * @return
+     */
+    int updateOrg(OrgDTO orgDTO);
+
+    /**
+     * 根据id查询客户/供应商
+     * @param id
+     * @return
+     */
+    OrgDTO selectOrgById(String id);
+
+    /**
+     * 根据id删除
+     * @param ids
+     * @return
+     */
+    int deleteOrgByIds(String[] ids);
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/org/service/impl/OrgServiceImpl.java

@@ -2,7 +2,11 @@ package com.ruoyi.ams.bionutrition.org.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.ruoyi.ams.bionutrition.org.bean.dto.OrgDTO;
 import com.ruoyi.ams.bionutrition.org.bean.entity.OrgEntity;
 import com.ruoyi.ams.bionutrition.org.mapper.OrgMapper;
@@ -14,8 +18,10 @@ import com.ruoyi.framework.service.impl.CrudServiceImpl;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @Service
 public class OrgServiceImpl extends CrudServiceImpl<OrgMapper, OrgEntity, OrgDTO> implements IOrgSevice {
@@ -28,14 +34,41 @@ public class OrgServiceImpl extends CrudServiceImpl<OrgMapper, OrgEntity, OrgDTO
                 ConvertUtils.sourceToTarget(orgEntities, OrgDTO.class) : Lists.newArrayList();
     }
 
+    @Override
+    public int insertOrg(OrgDTO orgDTO) {
+        Assert.notNull(orgDTO,"不允许插入空数据");
+        return baseDao.insert(ConvertUtils.sourceToTarget(orgDTO, OrgEntity.class));
+    }
+
+    @Override
+    public int updateOrg(OrgDTO orgDTO) {
+        UpdateWrapper<OrgEntity> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().eq(OrgEntity::getId, orgDTO.getId());
+        updateWrapper.lambda().eq(StringUtils.isNotBlank(orgDTO.getOrgType()), OrgEntity::getOrgType, orgDTO.getOrgType());
+        return baseDao.update(ConvertUtils.sourceToTarget(orgDTO, OrgEntity.class),updateWrapper);
+    }
+
+    @Override
+    public OrgDTO selectOrgById(String id) {
+        OrgEntity orgEntity = baseDao.selectById(id);
+        return ObjectUtil.isNotNull(orgEntity) ?
+                ConvertUtils.sourceToTarget(orgEntity, OrgDTO.class) : new OrgDTO();
+    }
+
+    @Override
+    public int deleteOrgByIds(String[] ids) {
+        return baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
 
     @Override
     public QueryWrapper<OrgEntity> getWrapper(Map<String, Object> params) {
         QueryWrapper<OrgEntity> queryWrapper = new QueryWrapper<>();
-        String orgStatus = StringUtils.isBlank((String)params.get("orgStatus"))
+        /*String orgStatus = StringUtils.isBlank((String)params.get("orgStatus"))
                 ? BizEnum.OrgStatus.Enable.getCode() : BizEnum.OrgStatus.Disable.getCode();
-        queryWrapper.lambda().eq(OrgEntity::getOrgStatus, orgStatus);
+        queryWrapper.lambda().eq(OrgEntity::getOrgStatus, orgStatus);*/
+        queryWrapper.lambda().eq(StringUtils.isNotBlank((String)params.get("orgStatus")), OrgEntity::getOrgStatus, params.get("orgStatus"));
         queryWrapper.lambda().eq(StringUtils.isNotBlank((String)params.get("orgName")), OrgEntity::getOrgName, params.get("orgName"));
+        queryWrapper.lambda().eq(StringUtils.isNotBlank((String)params.get("orgType")), OrgEntity::getOrgType, params.get("orgType"));
         return queryWrapper;
     }
 

warewms-base/src/main/java/com/ruoyi/base/constant/Constant.java

@@ -281,7 +281,6 @@ public class Constant {
      * 库区
      */
     public enum LOCATION_ZONE {
-
         /**
          * 立体库一层
          */
@@ -508,7 +507,6 @@ public class Constant {
     }
 
     public enum ZONE_TYPE {
-
         /**
          * 成品区
          */

warewms-base/src/main/java/com/ruoyi/base/constant/type/BizEnum.java

@@ -15,7 +15,7 @@ public class BizEnum {
         /**
          * 客户
          */
-        CUSTOMER("01");
+        CUSTOMER("10");
 
         private final String code;
 
@@ -35,13 +35,13 @@ public class BizEnum {
      */
     public enum OrgStatus implements IBaseEnum<String> {
         /**
-         * 供应商
+         * 启用
          */
-        Enable("1"),
+        Enable("0"),
         /**
-         * 客户
+         * 禁用
          */
-        Disable("0");
+        Disable("1");
 
         private final String code;