供应商模块

hx-saas-project/saas-entity/src/main/java/com/fjhx/config/entity/Config.java → hx-saas-project/saas-entity/src/main/java/com/fjhx/config/entity/BasicsConfig.java

@@ -16,6 +16,7 @@
  */
 package com.fjhx.config.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -35,7 +36,7 @@ import io.swagger.annotations.ApiModelProperty;
 @Data
 @TableName("stock_config")
 @ApiModel(value = "Config对象", description = "仓库")
-public class Config extends BaseStockEntity {
+public class BasicsConfig extends BaseStockEntity {
 
 	private static final long serialVersionUID = 1L;
 
@@ -43,12 +44,14 @@ public class Config extends BaseStockEntity {
 	* key值
 	*/
 	@ApiModelProperty(value = "key值")
-	private String cKey;
+	@TableField("c_key")
+	private String ckey;
 	/**
 	* value值
 	*/
 	@ApiModelProperty(value = "value值")
-	private String cValue;
+	@TableField("c_value")
+	private String cvalue;
 
 
 }

hx-saas-project/saas-entity/src/main/java/com/fjhx/supplier/entity/Supplier.java

@@ -0,0 +1,134 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import com.fjhx.base.BaseStockEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 供应商实体类
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+@Data
+@TableName("stock_supplier")
+@ApiModel(value = "Supplier对象", description = "供应商")
+public class Supplier extends BaseStockEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 编码
+	*/
+	@ApiModelProperty(value = "编码")
+	private String code;
+	/**
+	* 绑定用户
+	*/
+	@ApiModelProperty(value = "绑定用户")
+	private String bingdUserId;
+	/**
+	* 供应商名称
+	*/
+	@ApiModelProperty(value = "供应商名称")
+	private String name;
+	/**
+	* 帐期
+	*/
+	@ApiModelProperty(value = "帐期")
+	private Integer accountDate;
+	/**
+	* 账期说明
+	*/
+	@ApiModelProperty(value = "账期说明")
+	private String accountDateRemark;
+	/**
+	* 备注
+	*/
+	@ApiModelProperty(value = "备注")
+	private String remark;
+	/**
+	* 社会信用代码
+	*/
+	@ApiModelProperty(value = "社会信用代码")
+	private String societyCreditCode;
+	/**
+	* 法人
+	*/
+	@ApiModelProperty(value = "法人")
+	private String legalPerson;
+	/**
+	* 注册地址
+	*/
+	@ApiModelProperty(value = "注册地址")
+	private String registeredAddress;
+	/**
+	* 创建日期
+	*/
+	@ApiModelProperty(value = "创建日期")
+	private LocalDateTime establishDate;
+	/**
+	* 注册资本
+	*/
+	@ApiModelProperty(value = "注册资本")
+	private String registeredCapital;
+	/**
+	* 企业类型
+	*/
+	@ApiModelProperty(value = "企业类型")
+	private String enterpriseType;
+	/**
+	* 运营期限
+	*/
+	@ApiModelProperty(value = "运营期限")
+	private String businessTerm;
+	/**
+	* 运营范围
+	*/
+	@ApiModelProperty(value = "运营范围")
+	private String businessScope;
+	/**
+	* 物料类型
+	*/
+	@ApiModelProperty(value = "物料类型")
+	private String categoryId;
+	/**
+	* 加州65号法令合规测试证书
+	*/
+	@ApiModelProperty(value = "加州65号法令合规测试证书")
+	private String certificate;
+	/**
+	* 备注
+	*/
+	@ApiModelProperty(value = "备注")
+	private String representative;
+	/**
+	* 营业执照
+	*/
+	@ApiModelProperty(value = "营业执照")
+	private String businessLicense;
+
+
+}

hx-saas-project/saas-entity/src/main/java/com/fjhx/supplier/entity/SupplierBank.java

@@ -0,0 +1,68 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.fjhx.base.BaseStockEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 供应商收款账户实体类
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+@Data
+@TableName("stock_supplier_bank")
+@ApiModel(value = "SupplierBank对象", description = "供应商收款账户")
+public class SupplierBank extends BaseStockEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 账户名称
+	*/
+	@ApiModelProperty(value = "账户名称")
+	private String bankAccoutName;
+	/**
+	* 户名
+	*/
+	@ApiModelProperty(value = "户名")
+	private String accoutName;
+	/**
+	* 开户行
+	*/
+	@ApiModelProperty(value = "开户行")
+	@TableField("OpenBank")
+	private String openBank;
+	/**
+	* 账号
+	*/
+	@ApiModelProperty(value = "账号")
+	@TableField("BankAccout")
+	private String bankAccout;
+
+
+}

hx-saas-project/saas-entity/src/main/java/com/fjhx/supplier/entity/SupplierKeep.java

@@ -0,0 +1,60 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import com.fjhx.base.BaseStockEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 供应商维护记录实体类
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+@Data
+@TableName("stock_supplier_keep")
+@ApiModel(value = "SupplierKeep对象", description = "供应商维护记录")
+public class SupplierKeep extends BaseStockEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 供应商ID
+	*/
+	@ApiModelProperty(value = "供应商ID")
+	private String supplierId;
+	/**
+	* 照片
+	*/
+	@ApiModelProperty(value = "照片")
+	private String picUrl;
+	/**
+	* 标题
+	*/
+	@ApiModelProperty(value = "标题")
+	private String title;
+
+
+}

hx-saas-project/saas-entity/src/main/java/com/fjhx/supplier/entity/SupplierPrice.java

@@ -0,0 +1,66 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import com.fjhx.base.BaseStockEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 供应商价格实体类
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+@Data
+@TableName("stock_supplier_price")
+@ApiModel(value = "SupplierPrice对象", description = "供应商价格")
+public class SupplierPrice extends BaseStockEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 供应商ID
+	*/
+	@ApiModelProperty(value = "供应商ID")
+	private String supplierId;
+	/**
+	* 物料编号
+	*/
+	@ApiModelProperty(value = "物料编号")
+	private String materialId;
+	/**
+	* 采购单价
+	*/
+	@ApiModelProperty(value = "采购单价")
+	private BigDecimal price;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/config/controller/ConfigController.java

@@ -27,7 +27,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
-import com.fjhx.config.entity.Config;
+import com.fjhx.config.entity.BasicsConfig;
 import org.springblade.core.boot.ctrl.BladeController;
 
 /**
@@ -48,15 +48,15 @@ public class ConfigController extends BladeController {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-	public R<Config> detail(Config config) {
-		Config detail = configService.getOne(Condition.getQueryWrapper(config));
+	public R<BasicsConfig> detail(BasicsConfig config) {
+		BasicsConfig detail = configService.getOne(Condition.getQueryWrapper(config));
 		return R.data(detail);
 	}
 	/**
 	 * 详情
 	 */
 	@PostMapping("/submit")
-	public R submit(@RequestBody Config config) {
+	public R submit(@RequestBody BasicsConfig config) {
 		configService.submit(config);
 		return R.success();
 	}
@@ -64,7 +64,7 @@ public class ConfigController extends BladeController {
 	 * 新增 仓库
 	 */
 	@PostMapping("/save")
-	public R save(@Valid @RequestBody Config config) {
+	public R save(@Valid @RequestBody BasicsConfig config) {
 		return R.status(configService.save(config));
 	}
 
@@ -72,7 +72,7 @@ public class ConfigController extends BladeController {
 	 * 修改 仓库
 	 */
 	@PostMapping("/update")
-	public R update(@Valid @RequestBody Config config) {
+	public R update(@Valid @RequestBody BasicsConfig config) {
 		return R.status(configService.updateById(config));
 	}
 

hx-saas-project/saas-storage/src/main/java/com/fjhx/config/mapper/ConfigMapper.java

@@ -16,7 +16,7 @@
  */
 package com.fjhx.config.mapper;
 
-import com.fjhx.config.entity.Config;
+import com.fjhx.config.entity.BasicsConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -25,6 +25,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author BladeX
  * @since 2022-07-21
  */
-public interface ConfigMapper extends BaseMapper<Config> {
+public interface ConfigMapper extends BaseMapper<BasicsConfig> {
 
 }

hx-saas-project/saas-storage/src/main/java/com/fjhx/config/mapper/ConfigMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.fjhx.config.mapper.ConfigMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="configResultMap" type="com.fjhx.config.entity.Config">
+    <resultMap id="configResultMap" type="com.fjhx.config.entity.BasicsConfig">
         <id column="id" property="id"/>
         <result column="is_delete" property="isDelete"/>
         <result column="c_key" property="cKey"/>

hx-saas-project/saas-storage/src/main/java/com/fjhx/config/service/IConfigService.java

@@ -16,7 +16,7 @@
  */
 package com.fjhx.config.service;
 
-import com.fjhx.config.entity.Config;
+import com.fjhx.config.entity.BasicsConfig;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -25,11 +25,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author BladeX
  * @since 2022-07-21
  */
-public interface IConfigService extends IService<Config> {
+public interface IConfigService extends IService<BasicsConfig> {
 
     /**
      * 提交
      * @param config
      */
-    void submit(Config config);
+    void submit(BasicsConfig config);
 }

hx-saas-project/saas-storage/src/main/java/com/fjhx/config/service/impl/ConfigServiceImpl.java

@@ -16,19 +16,17 @@
  */
 package com.fjhx.config.service.impl;
 
+import com.alibaba.cloud.commons.lang.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fjhx.config.entity.Config;
+import com.fjhx.config.entity.BasicsConfig;
 import com.fjhx.config.mapper.ConfigMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.config.service.IConfigService;
-import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-
 /**
  * 配置 服务实现类
  *
@@ -36,7 +34,7 @@ import java.util.Date;
  * @since 2022-07-21
  */
 @Service
-public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, Config> implements IConfigService {
+public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, BasicsConfig> implements IConfigService {
 
 
     /**
@@ -45,14 +43,14 @@ public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, Config> impleme
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void submit(Config config) {
-        if(StringUtils.isEmpty(config.getCKey())){
+    public void submit(BasicsConfig config) {
+        if(StringUtils.isEmpty(config.getCkey())){
             throw new ServiceException("参数异常");
         }
-        Config c = getOne(Wrappers.<Config>query().lambda().eq(Config::getCKey,config.getCKey()));
+        BasicsConfig c = getOne(Wrappers.<BasicsConfig>query().lambda().eq(BasicsConfig::getCkey,config.getCkey()));
         if(ObjectUtil.isNotEmpty(c)){//修改
             config.setUpdate();
-            update(config, Wrappers.<Config>query().lambda().eq(Config::getCKey,config.getCKey()));
+            update(config, Wrappers.<BasicsConfig>query().lambda().eq(BasicsConfig::getCkey,config.getCkey()));
         }else{//添加
             config.setCreate();
             save(config);

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/controller/SupplierBankController.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.controller;
+
+import com.fjhx.supplier.service.ISupplierBankService;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+
+import org.springblade.common.constant.ApiConstant;
+import org.springframework.web.bind.annotation.*;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 供应商收款账户 控制器
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/supplierbank")
+@Api(value = "供应商收款账户", tags = "供应商收款账户接口")
+public class SupplierBankController extends BladeController {
+
+	private final ISupplierBankService supplierBankService;
+
+
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/controller/SupplierController.java

@@ -0,0 +1,82 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.controller;
+
+import com.fjhx.supplier.entity.Supplier;
+import com.fjhx.supplier.service.ISupplierService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.common.constant.ApiConstant;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 供应商 控制器
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/supplier")
+@Api(value = "供应商", tags = "供应商接口")
+public class SupplierController extends BladeController {
+
+	private final ISupplierService supplierService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	public R<Supplier> detail(Supplier supplier) {
+		Supplier detail = supplierService.getOne(Condition.getQueryWrapper(supplier));
+		return R.data(detail);
+	}
+
+
+	/**
+	 * 新增 供应商
+	 */
+	@PostMapping("/save")
+	public R save(@Valid @RequestBody Supplier supplier) {
+		return R.status(supplierService.save(supplier));
+	}
+
+	/**
+	 * 修改 供应商
+	 */
+	@PostMapping("/update")
+	public R update(@Valid @RequestBody Supplier supplier) {
+		return R.status(supplierService.updateById(supplier));
+	}
+
+	/**
+	 * 删除 供应商
+	 */
+	@PostMapping("/remove")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(supplierService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/controller/SupplierKeepController.java

@@ -0,0 +1,43 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.controller;
+
+import com.fjhx.supplier.service.ISupplierKeepService;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+
+import org.springblade.common.constant.ApiConstant;
+import org.springframework.web.bind.annotation.*;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 供应商维护记录 控制器
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/supplierkeep")
+@Api(value = "供应商维护记录", tags = "供应商维护记录接口")
+public class SupplierKeepController extends BladeController {
+
+	private final ISupplierKeepService supplierKeepService;
+
+
+	
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/controller/SupplierPriceController.java

@@ -0,0 +1,43 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.controller;
+
+import com.fjhx.supplier.service.ISupplierPriceService;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+
+import org.springblade.common.constant.ApiConstant;
+import org.springframework.web.bind.annotation.*;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 供应商价格 控制器
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/supplierprice")
+@Api(value = "供应商价格", tags = "供应商价格接口")
+public class SupplierPriceController extends BladeController {
+
+	private final ISupplierPriceService supplierPriceService;
+
+
+	
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/mapper/SupplierBankMapper.java

@@ -0,0 +1,31 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.mapper;
+
+import com.fjhx.supplier.entity.SupplierBank;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 供应商收款账户 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+public interface SupplierBankMapper extends BaseMapper<SupplierBank> {
+
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/mapper/SupplierBankMapper.xml

@@ -0,0 +1,19 @@
+<?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.supplier.mapper.SupplierBankMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="supplierBankResultMap" type="com.fjhx.supplier.entity.SupplierBank">
+        <id column="ID" property="id"/>
+        <result column="BankAccoutName" property="bankaccoutname"/>
+        <result column="AccoutName" property="accoutname"/>
+        <result column="OpenBank" property="openbank"/>
+        <result column="BankAccout" property="bankaccout"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="create_user" property="createUser"/>
+        <result column="update_user" property="updateUser"/>
+    </resultMap>
+
+</mapper>

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/mapper/SupplierKeepMapper.java

@@ -0,0 +1,31 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.mapper;
+
+import com.fjhx.supplier.entity.SupplierKeep;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 供应商维护记录 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+public interface SupplierKeepMapper extends BaseMapper<SupplierKeep> {
+
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/mapper/SupplierKeepMapper.xml

@@ -0,0 +1,18 @@
+<?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.supplier.mapper.SupplierKeepMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="supplierKeepResultMap" type="com.fjhx.supplier.entity.SupplierKeep">
+        <id column="ID" property="id"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="create_user" property="createUser"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="supplier_id" property="supplierId"/>
+        <result column="pic_url" property="picUrl"/>
+        <result column="title" property="title"/>
+    </resultMap>
+
+</mapper>

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/mapper/SupplierMapper.java

@@ -0,0 +1,31 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.mapper;
+
+import com.fjhx.supplier.entity.Supplier;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 供应商 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+public interface SupplierMapper extends BaseMapper<Supplier> {
+
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/mapper/SupplierMapper.xml

@@ -0,0 +1,33 @@
+<?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.supplier.mapper.SupplierMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="supplierResultMap" type="com.fjhx.supplier.entity.Supplier">
+        <id column="id" property="id"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="create_user" property="createUser"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="code" property="code"/>
+        <result column="bingd_user_id" property="bingdUserId"/>
+        <result column="name" property="name"/>
+        <result column="account_date" property="accountDate"/>
+        <result column="account_date_remark" property="accountDateRemark"/>
+        <result column="remark" property="remark"/>
+        <result column="society_credit_code" property="societyCreditCode"/>
+        <result column="legal_person" property="legalPerson"/>
+        <result column="registered_address" property="registeredAddress"/>
+        <result column="establish_date" property="establishDate"/>
+        <result column="registered_capital" property="registeredCapital"/>
+        <result column="enterprise_type" property="enterpriseType"/>
+        <result column="business_term" property="businessTerm"/>
+        <result column="business_scope" property="businessScope"/>
+        <result column="category_id" property="categoryId"/>
+        <result column="certificate" property="certificate"/>
+        <result column="representative" property="representative"/>
+        <result column="business_license" property="businessLicense"/>
+    </resultMap>
+
+</mapper>

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/mapper/SupplierPriceMapper.java

@@ -0,0 +1,31 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.mapper;
+
+import com.fjhx.supplier.entity.SupplierPrice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
+/**
+ * 供应商价格 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+public interface SupplierPriceMapper extends BaseMapper<SupplierPrice> {
+
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/mapper/SupplierPriceMapper.xml

@@ -0,0 +1,18 @@
+<?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.supplier.mapper.SupplierPriceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="supplierPriceResultMap" type="com.fjhx.supplier.entity.SupplierPrice">
+        <id column="ID" property="id"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="create_user" property="createUser"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="supplier_id" property="supplierId"/>
+        <result column="material_id" property="materialId"/>
+        <result column="price" property="price"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+</mapper>

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/service/ISupplierBankService.java

@@ -0,0 +1,30 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.service;
+
+import com.fjhx.supplier.entity.SupplierBank;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 供应商收款账户 服务类
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+public interface ISupplierBankService extends IService<SupplierBank> {
+
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/service/ISupplierKeepService.java

@@ -0,0 +1,31 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.service;
+
+import com.fjhx.supplier.entity.SupplierKeep;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 供应商维护记录 服务类
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+public interface ISupplierKeepService extends IService<SupplierKeep> {
+
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/service/ISupplierPriceService.java

@@ -0,0 +1,30 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.service;
+
+import com.fjhx.supplier.entity.SupplierPrice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 供应商价格 服务类
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+public interface ISupplierPriceService extends IService<SupplierPrice> {
+
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/service/ISupplierService.java

@@ -0,0 +1,30 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.service;
+
+import com.fjhx.supplier.entity.Supplier;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 供应商 服务类
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+public interface ISupplierService extends IService<Supplier> {
+
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/service/impl/SupplierBankServiceImpl.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.service.impl;
+
+import com.fjhx.supplier.entity.SupplierBank;
+import com.fjhx.supplier.mapper.SupplierBankMapper;
+import com.fjhx.supplier.service.ISupplierBankService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 供应商收款账户 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+@Service
+public class SupplierBankServiceImpl extends ServiceImpl<SupplierBankMapper, SupplierBank> implements ISupplierBankService {
+
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/service/impl/SupplierKeepServiceImpl.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.service.impl;
+
+import com.fjhx.supplier.entity.SupplierKeep;
+import com.fjhx.supplier.mapper.SupplierKeepMapper;
+import com.fjhx.supplier.service.ISupplierKeepService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 供应商维护记录 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+@Service
+public class SupplierKeepServiceImpl extends ServiceImpl<SupplierKeepMapper, SupplierKeep> implements ISupplierKeepService {
+
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/service/impl/SupplierPriceServiceImpl.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.service.impl;
+
+import com.fjhx.supplier.entity.SupplierPrice;
+import com.fjhx.supplier.mapper.SupplierPriceMapper;
+import com.fjhx.supplier.service.ISupplierPriceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 供应商价格 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+@Service
+public class SupplierPriceServiceImpl extends ServiceImpl<SupplierPriceMapper, SupplierPrice> implements ISupplierPriceService {
+
+
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/supplier/service/impl/SupplierServiceImpl.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.supplier.service.impl;
+
+import com.fjhx.supplier.entity.Supplier;
+import com.fjhx.supplier.mapper.SupplierMapper;
+import com.fjhx.supplier.service.ISupplierService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 供应商 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-07-22
+ */
+@Service
+public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> implements ISupplierService {
+
+
+}

hx-service-api/storage-api/src/main/java/com/fjhx/entity/purchase/PurchaseContract.java

@@ -235,4 +235,12 @@ public class PurchaseContract extends BasicEntity {
      */
     @TableField(exist = false)
     private Integer accountDate;
+
+    /**
+     * 入库编号
+     */
+    @TableField(exist = false)
+    private String inOutStorageNo;
+
+
 }

hx-service/storage/src/main/java/com/fjhx/purchase/controller/PurchaseContractController.java

@@ -87,14 +87,14 @@ public class PurchaseContractController {
     }
 
     /**
-     * 列表条数
+     * 统计
      * @param condition
      * @return
      */
     @PostMapping("/pay/statistics")
     public R statistics(@RequestBody Map<String, Object> condition){
-        Map<String,Object> map = purchaseContractService.getPayGroupBySu(condition);
-        return R.success(map);
+        List<Map<String,Object>> list = purchaseContractService.getPayGroupBySu(condition);
+        return R.success(list);
     }
 
 }

hx-service/storage/src/main/java/com/fjhx/purchase/mapper/PurchaseContractMapper.java

@@ -54,5 +54,5 @@ public interface PurchaseContractMapper extends BaseMapper<PurchaseContract> {
      * @return
      */
     @TenantIgnore
-    Map<String,Object> getPayGroupBySu(Map<String,Object> condition);
+    List<Map<String,Object>> getPayGroupBySu(Map<String,Object> condition);
 }

hx-service/storage/src/main/java/com/fjhx/purchase/mapper/PurchaseContractMapper.xml

@@ -87,11 +87,14 @@
             <if test="supplierName neq null and supplierName neq '' ">
                 AND (INSTR(t2.`Name`, #{supplierName}) > 0)
             </if>
+            <if test="supplierId neq null and supplierId neq '' ">
+                AND t2.id = #{supplierId}
+            </if>
             <if test="materialName neq null and materialName neq '' ">
                 AND (INSTR(t3.`Name`, #{materialName}) > 0)
             </if>
-            <if test="strTime neq null and strTime neq '' ">
-                and t5.ApprovalTime &gt;= #{strTime,jdbcType=VARCHAR}
+            <if test="beginTime neq null and beginTime neq '' ">
+                and t5.ApprovalTime &gt;= #{beginTime,jdbcType=VARCHAR}
             </if>
             <if test="endTime neq null and endTime neq '' ">
                 and t5.ApprovalTime &lt;= #{endTime,jdbcType=VARCHAR}
@@ -103,6 +106,7 @@
         t2.`Name` AS supplierName,
         t3.`Name` AS materialName,
         t3.Spec AS materialSpec,
+        t4.inOutStorageNo AS inOutStorageNo,
         DATE_FORMAT(t4.CompleteStockTime,'%Y-%m-%d') AS completeStockTime,
         IFNULL(t2.AccountDate,0) AS accountDate,
         ( SELECT GROUP_CONCAT( CheckFinish ) FROM stock_quantitycheck WHERE PurchaseBillNo = t1.PurchaseBillNo ) AS quantityStatus,

hx-service/storage/src/main/java/com/fjhx/purchase/service/PurchaseContractService.java

@@ -56,5 +56,5 @@ public interface PurchaseContractService extends BaseService<PurchaseContract> {
      * @param condition
      * @return
      */
-    Map<String,Object> getPayGroupBySu(Map<String,Object> condition);
+    List<Map<String,Object>> getPayGroupBySu(Map<String,Object> condition);
 }

hx-service/storage/src/main/java/com/fjhx/purchase/service/impl/PurchaseContractServiceImpl.java

@@ -121,7 +121,7 @@ public class PurchaseContractServiceImpl extends ServiceImpl<PurchaseContractMap
      * @return
      */
     @Override
-    public Map<String, Object> getPayGroupBySu(Map<String, Object> condition) {
+    public List<Map<String,Object>> getPayGroupBySu(Map<String, Object> condition) {
         return baseMapper.getPayGroupBySu(condition);
     }
 }

hx-service/storage/src/main/java/com/fjhx/supplier/mapper/SupplierMapper.xml

@@ -188,6 +188,7 @@
         GROUP BY
             DATE_FORMAT(t3.CreatedTime,"%Y-%m"))AS b
         ON DATE_FORMAT(a.`CreatedTime`,'%c') = DATE_FORMAT(b.CreatedTime,"%c")
+        ORDER BY a.CreatedTime ASC
     </select>
 
     <select id="getAllSumMoneyAndCount" resultType="java.util.Map">
@@ -224,6 +225,7 @@
         GROUP BY
             DATE_FORMAT( t2.CreatedTime, '%Y-%m' ))AS b
         ON DATE_FORMAT(a.`CreatedTime`,'%c') = DATE_FORMAT(b.CreatedTime,"%c")
+        ORDER BY a.CreatedTime ASC
     </select>
 
     <select id="selectList" resultType="com.fjhx.entity.supplier.Supplier">
@@ -278,28 +280,28 @@
     </sql>
     <sql id="getMonth">
         SELECT
-            DATE_FORMAT( CURDATE( ), '%Y-%m-%d %H:%i:%s' ) AS CreatedTime UNION
+            CONCAT(#{date},"-01-01 00:00:00") AS CreatedTime UNION
         SELECT
-            DATE_FORMAT( CURDATE( ) - INTERVAL 1 MONTH, '%Y-%m-%d %H:%i:%s' ) AS CreatedTime UNION
+            CONCAT(#{date},"-02-01 00:00:00") AS CreatedTime UNION
         SELECT
-            DATE_FORMAT( CURDATE( ) - INTERVAL 2 MONTH, '%Y-%m-%d %H:%i:%s' ) AS CreatedTime UNION
+            CONCAT(#{date},"-03-01 00:00:00") AS CreatedTime UNION
         SELECT
-            DATE_FORMAT( CURDATE( ) - INTERVAL 3 MONTH, '%Y-%m-%d %H:%i:%s' ) AS CreatedTime UNION
+            CONCAT(#{date},"-04-01 00:00:00") AS CreatedTime UNION
         SELECT
-            DATE_FORMAT( CURDATE( ) - INTERVAL 4 MONTH, '%Y-%m-%d %H:%i:%s' ) AS CreatedTime UNION
+            CONCAT(#{date},"-05-01 00:00:00") AS CreatedTime UNION
         SELECT
-            DATE_FORMAT( CURDATE( ) - INTERVAL 5 MONTH, '%Y-%m-%d %H:%i:%s' ) AS CreatedTime UNION
+            CONCAT(#{date},"-06-01 00:00:00") AS CreatedTime UNION
         SELECT
-            DATE_FORMAT( CURDATE( ) - INTERVAL 6 MONTH, '%Y-%m-%d %H:%i:%s' ) AS CreatedTime UNION
+            CONCAT(#{date},"-07-01 00:00:00") AS CreatedTime UNION
         SELECT
-            DATE_FORMAT( CURDATE( ) - INTERVAL 7 MONTH, '%Y-%m-%d %H:%i:%s' ) AS CreatedTime UNION
+            CONCAT(#{date},"-08-01 00:00:00") AS CreatedTime UNION
         SELECT
-            DATE_FORMAT( CURDATE( ) - INTERVAL 8 MONTH, '%Y-%m-%d %H:%i:%s' ) AS CreatedTime UNION
+            CONCAT(#{date},"-09-01 00:00:00") AS CreatedTime UNION
         SELECT
-            DATE_FORMAT( CURDATE( ) - INTERVAL 9 MONTH, '%Y-%m-%d %H:%i:%s' ) AS CreatedTime UNION
+            CONCAT(#{date},"-10-01 00:00:00") AS CreatedTime UNION
         SELECT
-            DATE_FORMAT( CURDATE( ) - INTERVAL 10 MONTH, '%Y-%m-%d %H:%i:%s' ) AS CreatedTime UNION
+            CONCAT(#{date},"-11-01 00:00:00") AS CreatedTime UNION
         SELECT
-            DATE_FORMAT( CURDATE( ) - INTERVAL 11 MONTH, '%Y-%m-%d %H:%i:%s' ) AS CreatedTime
+            CONCAT(#{date},"-12-01 00:00:00") AS CreatedTime
     </sql>
 </mapper>