物料申购属性统计

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

@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.generator.config.po.TableFill;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.DateType;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.fjhx.base.BaseEntity;
-import com.fjhx.base.BaseService;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -42,6 +40,10 @@ public class CodeGenerator {
     public static String USER_NAME = "";
     public static String PASSWORD = "";
 
+
+    public static String BASE_ENTITY_PATH = "com.fjhx.base.BaseEntity";
+    public static String BASE_SERVICE_PATH = "com.fjhx.base.BaseService";
+
     // 执行代码生成
     public static void execute() {
 
@@ -110,9 +112,9 @@ public class CodeGenerator {
         strategy.setCapitalMode(false);
         strategy.setEntitySerialVersionUID(false);
         // service继承规则
-        strategy.setSuperServiceClass(BaseService.class);
+        strategy.setSuperServiceClass(BASE_SERVICE_PATH);
         // 实体继承规则
-        strategy.setSuperEntityClass(BaseEntity.class);
+        strategy.setSuperEntityClass(BASE_ENTITY_PATH);
         strategy.setTableFillList(Arrays.asList(
                 new TableFill("del_flag", FieldFill.INSERT),
                 new TableFill("version", FieldFill.INSERT)));

hx-common/common-tool/src/main/java/com/fjhx/utils/BigDecimalUtil.java

@@ -15,6 +15,9 @@ public class BigDecimalUtil {
      * 值保留几位小数
      */
     public static BigDecimal keepDecimals(Object value, int scale) {
+        if (value == null) {
+            return BigDecimal.ZERO.setScale(scale, RoundingMode.HALF_UP);
+        }
         return (objToBigDecimal(value)).setScale(scale, RoundingMode.HALF_UP);
     }
 
@@ -22,6 +25,9 @@ public class BigDecimalUtil {
      * 默认保留2位小数
      */
     public static BigDecimal keepDecimals(Object value) {
+        if (value == null) {
+            return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
+        }
         return (objToBigDecimal(value)).setScale(2, RoundingMode.HALF_UP);
     }
 

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/attachment/StockAttachment.java

@@ -1,59 +0,0 @@
-package com.fjhx.attachment;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fjhx.base.BasicEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 业务附件表
- * </p>
- *
- * @author ${author}
- * @since 2022-07-12
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class StockAttachment extends BasicEntity {
-
-
-    /**
-     * 业务表id，0表示空
-     */
-    @TableField("busiId")
-    private String busiId;
-
-    /**
-     * 业务类型：（1、面料问题反馈图片）
-     */
-    @TableField("busiType")
-    private Integer busiType;
-
-    /**
-     * 附件的真实名称
-     */
-    @TableField("realName")
-    private String realName;
-
-    /**
-     * 附件的临时名称
-     */
-    @TableField("temName")
-    private String temName;
-
-    /**
-     * 路径
-     */
-    private String path;
-
-    /**
-     * 文件后缀
-     */
-    private String format;
-
-    /**
-     * 大小
-     */
-    private Long size;
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/attachment/StockAttachmentEx.java

@@ -1,16 +0,0 @@
-package com.fjhx.attachment;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 业务附件表
- *
- * @author ${author}
- * @since 2022-07-12
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class StockAttachmentEx extends StockAttachment {
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/attachment/StockAttachmentVo.java

@@ -1,16 +0,0 @@
-package com.fjhx.attachment;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 业务附件表
- *
- * @author ${author}
- * @since 2022-07-12
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class StockAttachmentVo extends StockAttachment {
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/attachment/enums/AttachmentTypeEnum.java

@@ -1,64 +0,0 @@
-package com.fjhx.attachment.enums;
-
-import cn.hutool.core.util.ObjectUtil;
-import org.springblade.core.tool.utils.StringPool;
-
-import java.util.LinkedHashMap;
-
-/**
- * 文件类型枚举
- */
-public enum AttachmentTypeEnum {
-    TYPE_ONE(1, "面料问题反馈图片"),
-    TYPE_TWO(2, "供应商其他资质"),
-    ;
-
-    private int key;
-
-    private String value;
-
-    private static LinkedHashMap<Integer, String> map = new LinkedHashMap<>();
-
-    AttachmentTypeEnum(int key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    /**
-     * 获取枚举map
-     *
-     * @return
-     */
-    public static LinkedHashMap<Integer, String> getMap() {
-        if (ObjectUtil.isNotEmpty(map)) {
-            return map;
-        }
-        for (AttachmentTypeEnum ms : values()) {
-            map.put(ms.key, ms.value);
-        }
-        return map;
-    }
-
-    /**
-     * 通过key获取名称
-     *
-     * @param key
-     * @return
-     */
-    public static String getNameByKey(Integer key) {
-        if (key == null || key < 0) {
-            return StringPool.EMPTY;
-        }
-        LinkedHashMap<Integer, String> map = getMap();
-        return map.getOrDefault(key, StringPool.EMPTY);
-    }
-
-    public int getKey() {
-        return key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/base/BaseStockEntity.java

@@ -1,71 +0,0 @@
-package com.fjhx.base;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class BaseStockEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private String id;
-
-    /**
-     * 是否删除
-     */
-    @TableLogic
-    private String isDelete;
-    /**
-     * 创建人id
-     */
-    private String createUser;
-
-    /**
-     * 创建时间
-     */
-    @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME)
-    @JsonFormat(pattern = DateUtil.PATTERN_DATETIME)
-    private Date createTime;
-
-    /**
-     * 更新人id
-     */
-    private String updateUser;
-
-    /**
-     * 更新时间
-     */
-    @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME)
-    @JsonFormat(pattern = DateUtil.PATTERN_DATETIME)
-    private Date updateTime;
-
-    /**
-     * 赋值创建时间和创建人
-     */
-    public void setCreate() {
-        setCreateTime(new Date());
-        setCreateUser(AuthUtil.getUserIdStr());
-    }
-
-    /**
-     * 赋值更新时间和更新人
-     */
-    public void setUpdate() {
-        setUpdateTime(new Date());
-        setUpdateUser(AuthUtil.getUserIdStr());
-    }
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/base/Pager.java

@@ -1,125 +0,0 @@
-package com.fjhx.base;
-
-import java.io.Serializable;
-
-/**
- * 分页
- *
- * @Author:caozj
- * @DATE:2022/7/12 17:36
- */
-public class Pager implements Serializable {
-
-    private static final long serialVersionUID = 4781129496475920388L;
-
-    // 当前页
-    private int pageNum;
-
-    // 显示数
-    private int pageSize;
-
-    // 总条数
-    private int totalCount;
-
-    // 开始
-    private int pageStart;
-
-    // 结束
-    private int pageEnd;
-
-    // 总页数
-    private int totalPage;
-
-    public Pager() {
-
-    }
-
-    /**
-     * 分页
-     *
-     * @param pageNum  当前页
-     * @param pageSize 显示数
-     */
-    public Pager(int pageNum, int pageSize) {
-        if (pageNum <= 0) {
-            pageNum = 1;
-        }
-        if (pageSize <= 0) {
-            pageSize = 10;
-        }
-
-        this.pageNum = pageNum;
-        this.pageSize = pageSize;
-    }
-
-    public int getpageNum() {
-        return pageNum;
-    }
-
-    public void setpageNum(int pageNum) {
-        this.pageNum = pageNum;
-    }
-
-    public int getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(int pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public int getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(int totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public int getPageStart() {
-        // 分页起始
-        if (pageNum > 0) {
-            this.pageStart = (pageNum - 1) * pageSize;
-        }
-        return pageStart;
-    }
-
-    public void setPageStart(int pageStart) {
-        this.pageStart = pageStart;
-    }
-
-    public int getPageEnd() {
-        // 分页结束
-        this.pageEnd = pageNum * pageSize;
-        return pageEnd;
-    }
-
-    public void setPageEnd(int pageEnd) {
-        this.pageEnd = pageEnd;
-    }
-
-    public int getTotalPage() {
-        if (pageSize <= 0) {
-            return 0;
-        }
-        // 总页数
-        this.totalPage = (totalCount + pageSize - 1) / pageSize;
-        return this.totalPage;
-    }
-
-    public void setTotalPage(int totalPage) {
-
-    }
-
-    @Override
-    public String toString() {
-        return "Pager{" +
-                "pageNum=" + pageNum +
-                ", pageSize=" + pageSize +
-                ", totalCount=" + totalCount +
-                ", pageStart=" + pageStart +
-                ", pageEnd=" + pageEnd +
-                ", totalPage=" + totalPage +
-                '}';
-    }
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/base/BasicEntity.java → hx-service-api/storage-restructure-api/src/main/java/com/fjhx/base/StorageBaseEntity.java

@@ -1,7 +1,6 @@
 package com.fjhx.base;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
@@ -9,7 +8,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 @Data
-public class BasicEntity implements Serializable {
+public class StorageBaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -17,18 +16,26 @@ public class BasicEntity implements Serializable {
      * 主键id
      */
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private String id;
+    private Long id;
 
     /**
      * 创建时间
      */
-    @TableField("CreatedTime")
-    private Date createdTime;
+    private Date createTime;
 
     /**
      * 更新时间
      */
-    @TableField("UpdatedTime")
-    private Date updatedTime;
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+    private Long createUser;
+
+    /**
+     * 更新人
+     */
+    private Long updateUser;
 
 }

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/base/StorageBaseService.java

@@ -0,0 +1,184 @@
+package com.fjhx.base;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.core.secure.utils.AuthUtil;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+public interface StorageBaseService<T> extends IService<T> {
+
+    /**
+     * 获取分页
+     */
+    default Page<T> createPage(Map<String, String> condition) {
+        return new Page<>(getCurrent(condition), getSize(condition));
+    }
+
+    /**
+     * 获取分页
+     */
+    default Page<Map<String, Object>> createPageMap(Map<String, String> condition) {
+        return new Page<>(getCurrent(condition), getSize(condition));
+    }
+
+    default int getCurrent(Map<String, String> condition) {
+        String currentStr = condition.get("pageNum");
+        return ObjectUtil.isEmpty(currentStr) ? 1 : Integer.parseInt(currentStr);
+    }
+
+    default int getSize(Map<String, String> condition) {
+        String sizeStr = condition.get("pageSize");
+        return ObjectUtil.isEmpty(sizeStr) ? 10 : Integer.parseInt(sizeStr);
+    }
+
+    /**
+     * 执行分页查询
+     *
+     * @param condition    条件
+     * @param queryWrapper wrapper
+     * @return 分页后的对象
+     */
+    default Page<T> page(Map<String, String> condition, Wrapper<T> queryWrapper) {
+        Page<T> page = createPage(condition);
+        return page(page, queryWrapper);
+    }
+
+    /**
+     * 执行分页查询
+     *
+     * @param condition    条件
+     * @param queryWrapper wrapper
+     * @return 分页后的对象
+     */
+    default Page<Map<String, Object>> pageMaps(Map<String, String> condition, Wrapper<T> queryWrapper) {
+        Page<Map<String, Object>> page = createPageMap(condition);
+        return pageMaps(page, queryWrapper);
+    }
+
+    /**
+     * 获取添加过的某个字段的去重列表
+     */
+    default List<?> getDistinctList(SFunction<T, ?> column) {
+        return list(Wrappers.<T>lambdaQuery().select(column))
+                .stream().map(column).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+    }
+
+    /**
+     * 条件查询
+     */
+    default List<T> list(SFunction<T, ?> column, Object val) {
+        return lambdaQuery().eq(column, val).list();
+    }
+
+    /**
+     * 条件查询
+     */
+    default T getOne(SFunction<T, ?> column, Object val) {
+        return lambdaQuery().eq(column, val).last("limit 1").one();
+    }
+
+    /**
+     * 条件查询
+     */
+    default Integer count(SFunction<T, ?> column, Object val) {
+        return lambdaQuery().eq(column, val).count();
+    }
+
+    /**
+     * 按指定规则删除
+     */
+    default boolean remove(SFunction<T, ?> column, Object val) {
+        return remove(Wrappers.<T>lambdaQuery().eq(column, val));
+    }
+
+    @Override
+    default boolean save(T entity) {
+        setCreateInfo(entity);
+        return IService.super.save(entity);
+    }
+
+    @Override
+    default boolean saveBatch(Collection<T> entityList) {
+        entityList.forEach(this::setCreateInfo);
+        return IService.super.saveBatch(entityList);
+    }
+
+    @Override
+    default boolean saveOrUpdateBatch(Collection<T> entityList) {
+        entityList.forEach(item -> {
+            if (item instanceof StorageBaseEntity) {
+                if (ObjectUtil.isEmpty(((StorageBaseEntity) item).getId())) {
+                    setCreateInfo(item);
+                } else {
+                    setUpdateInfo(item);
+                }
+            }
+        });
+
+        return IService.super.saveOrUpdateBatch(entityList);
+    }
+
+    @Override
+    default boolean updateById(T entity) {
+        setUpdateInfo(entity);
+        return IService.super.updateById(entity);
+    }
+
+    @Override
+    default boolean update(T entity, Wrapper<T> updateWrapper) {
+        setUpdateInfo(entity);
+        return IService.super.update(entity, updateWrapper);
+    }
+
+    @Override
+    default boolean updateBatchById(Collection<T> entityList) {
+        entityList.forEach(this::setUpdateInfo);
+        return IService.super.updateBatchById(entityList);
+    }
+
+    @Override
+    default boolean saveOrUpdate(T entity, Wrapper<T> updateWrapper) {
+        if (entity instanceof StorageBaseEntity) {
+            if (ObjectUtil.isEmpty(((StorageBaseEntity) entity).getId())) {
+                setCreateInfo(entity);
+            } else {
+                setUpdateInfo(entity);
+            }
+        }
+        return IService.super.saveOrUpdate(entity, updateWrapper);
+    }
+
+    /**
+     * 调新增方法时默认传入创建人、创建时间、租户id
+     */
+    default void setCreateInfo(T entity) {
+        if (entity instanceof StorageBaseEntity) {
+            Date date = new Date();
+            Long userId = AuthUtil.getUserId();
+            ((StorageBaseEntity) entity).setCreateUser(userId);
+            ((StorageBaseEntity) entity).setCreateTime(date);
+            ((StorageBaseEntity) entity).setUpdateUser(userId);
+            ((StorageBaseEntity) entity).setUpdateTime(date);
+        }
+    }
+
+    /**
+     * 调编辑方法时默认传入更新人、更新时间
+     */
+    default void setUpdateInfo(T entity) {
+        if (entity instanceof StorageBaseEntity) {
+            ((StorageBaseEntity) entity).setCreateUser(null);
+            ((StorageBaseEntity) entity).setCreateTime(null);
+            ((StorageBaseEntity) entity).setUpdateUser(AuthUtil.getUserId());
+            ((StorageBaseEntity) entity).setUpdateTime(new Date());
+        }
+    }
+
+}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/base/TreeNode.java

@@ -1,120 +0,0 @@
-package com.fjhx.base;
-
-import cn.hutool.core.util.ObjectUtil;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * 树节点
- */
-public class TreeNode implements Serializable {
-
-    private static final long serialVersionUID = 9014732915522174992L;
-
-    //节点ID
-    private String id;
-
-    //节点名称
-    private String text;
-
-    //节点父级ID
-    private String pId;
-
-    //节点所有的上级ID
-    private String pIds;
-
-    //节点其余属性
-    private HashMap<String, Object> attrs = new HashMap<>();
-
-    //子节点
-    private List<TreeNode> children;
-
-    public TreeNode() {
-
-    }
-
-    public TreeNode(String id, String text) {
-        this.id = id;
-        this.text = text;
-    }
-
-    public TreeNode(String id, String text, String pId) {
-        this.id = id;
-        this.text = text;
-        this.pId = pId;
-    }
-
-    public TreeNode(String id, String text, String pId, String pIds) {
-        this.id = id;
-        this.text = text;
-        this.pId = pId;
-        this.pIds = pIds;
-    }
-
-    /**
-     * 新增节点属性
-     *
-     * @param key
-     * @param value
-     */
-    public void putAttrs(String key, Object value) {
-        if (ObjectUtil.isEmpty(key) || value == null) {
-            return;
-        }
-        attrs.put(key, value);
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public String getpId() {
-        return pId;
-    }
-
-    public void setpId(String pId) {
-        this.pId = pId;
-    }
-
-    public String getpIds() {
-        return pIds;
-    }
-
-    public void setpIds(String pIds) {
-        this.pIds = pIds;
-    }
-
-    public HashMap<String, Object> getAttrs() {
-        return attrs;
-    }
-
-    public void setAttrs(HashMap<String, Object> attrs) {
-        if (ObjectUtil.isEmpty(attrs)) {
-            return;
-        }
-        this.attrs.putAll(attrs);
-    }
-
-    public List<TreeNode> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<TreeNode> children) {
-        this.children = children;
-    }
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/config/entity/BasicsConfig.java

@@ -1,54 +0,0 @@
-/*
- *      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.config.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import com.fjhx.base.BaseStockEntity;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 配置实体类
- *
- * @author BladeX
- * @since 2022-07-21
- */
-@Data
-@TableName("stock_config")
-@ApiModel(value = "Config对象", description = "仓库")
-public class BasicsConfig extends BaseStockEntity {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* key值
-	*/
-	@ApiModelProperty(value = "key值")
-	@TableField("c_key")
-	private String ckey;
-	/**
-	* value值
-	*/
-	@ApiModelProperty(value = "value值")
-	@TableField("c_value")
-	private String cvalue;
-
-
-}

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

@@ -1,210 +0,0 @@
-/*
- *      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.contract.entity;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-import java.util.List;
-
-import com.fjhx.base.BaseStockEntity;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 采购合同实体类
- *
- * @author BladeX
- * @since 2022-07-27
- */
-@Data
-@TableName("stock_purchase_contract")
-@ApiModel(value = "PurchaseContract对象", description = "采购合同")
-public class PurchaseContract extends BaseStockEntity {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 申购单ID
-	*/
-	@ApiModelProperty(value = "申购单ID")
-	private String applyPurchaseId;
-	/**
-	* 采购合同单号
-	*/
-	@ApiModelProperty(value = "采购合同单号")
-	private String purchaseBillNo;
-	/**
-	* 供应商ID（对应表ord_factory的ID）
-	*/
-	@ApiModelProperty(value = "供应商ID（对应表ord_factory的ID）")
-	private String supplierId;
-	/**
-	* 交付日期
-	*/
-	@ApiModelProperty(value = "交付日期")
-	private Date deliverTime;
-	/**
-	* 账期
-	*/
-	@ApiModelProperty(value = "账期")
-	private Integer accountPeriod;
-	/**
-	* 增值税
-	*/
-	@ApiModelProperty(value = "增值税")
-	private BigDecimal taxValue;
-	/**
-	* 发票类型 （枚举定义：0=专用，1=普通）
-	*/
-	@ApiModelProperty(value = "发票类型 （枚举定义：0=专用，1=普通）")
-	private Integer invoiceType;
-	/**
-	* 签约时间
-	*/
-	@ApiModelProperty(value = "签约时间")
-	private Date signTime;
-	/**
-	* 采购合同状态 （枚举定义：0=待确认，1=审批中，2=进行中，3=已完成）
-	*/
-	@ApiModelProperty(value = "采购合同状态 （枚举定义：0=待确认，1=审批中，2=进行中，3=已完成）")
-	private Integer purContractState;
-	/**
-	* 合同付款状态 （枚举定义：0=审批中，1=进行中，2=已完成）
-	*/
-	@ApiModelProperty(value = "合同付款状态 （枚举定义：0=审批中，1=进行中，2=已完成）")
-	private Integer contractPayState;
-	/**
-	* 供应商出货状态 （枚举定义：0=进行中，1=已完成）
-	*/
-	@ApiModelProperty(value = "供应商出货状态 （枚举定义：0=进行中，1=已完成）")
-	private Integer supplierShipState;
-	/**
-	* 审批状态 （枚举定义：0=待审批，1=审批中，2=已审批，3=已驳回，4=已撤回）
-	*/
-	@ApiModelProperty(value = "审批状态 （枚举定义：0=待审批，1=审批中，2=已审批，3=已驳回，4=已撤回）")
-	private Integer approveBillState;
-	/**
-	* 审核时间
-	*/
-	@ApiModelProperty(value = "审核时间")
-	private Date approvalTime;
-	/**
-	* 备注
-	*/
-	@ApiModelProperty(value = "备注")
-	private String remark;
-	/**
-	* 质检修正金额
-	*/
-	@ApiModelProperty(value = "质检修正金额")
-	private BigDecimal adjustAmount;
-	/**
-	* 质检修正数量
-	*/
-	@ApiModelProperty(value = "质检修正数量")
-	private BigDecimal adjustQty;
-	/**
-	* 已付金额
-	*/
-	@ApiModelProperty(value = "已付金额")
-	private BigDecimal hadPayAmount;
-	/**
-	* 申请付款金额
-	*/
-	@ApiModelProperty(value = "申请付款金额")
-	private BigDecimal applyPayAmount;
-	/**
-	* 退货数量
-	*/
-	@ApiModelProperty(value = "退货数量")
-	private BigDecimal retBackQty;
-
-	/**
-	 * 合同物料列表
-	 */
-	@TableField(exist = false)
-	private List<PurchaseContractMaterial> materialList;
-
-
-	/**
-	 * 采购数量
-	 */
-	@TableField(exist = false)
-	private Integer purchaseQty;
-
-	/**
-	 * 采购价格
-	 */
-	@TableField(exist = false)
-	private BigDecimal purchasePrice;
-
-	/**
-	 * 采购小计
-	 */
-	@TableField(exist = false)
-	private BigDecimal purchaseTotalAmount;
-	/**
-	 * 物料名称
-	 */
-	@TableField(exist = false)
-	private String materialName;
-
-	/**
-	 * 物料单位
-	 */
-	@TableField(exist = false)
-	private String materialUnit;
-
-	/**
-	 * 物料备注
-	 */
-	@TableField(exist = false)
-	private String materialRemark;
-	/**
-	 * 物料规格
-	 */
-	@TableField(exist = false)
-	private String materialSpec;
-
-	/**
-	 * 物料编码
-	 */
-	@TableField(exist = false)
-	private String materialCode;
-	/**
-	 * 物料ID
-	 */
-	@TableField(exist = false)
-	private String materialId;
-
-	/**
-	 * 申购单号
-	 */
-	@TableField(exist = false)
-	private String applyBillNo;
-
-	/**
-	 * 供应商名称
-	 */
-	@TableField(exist = false)
-	private String supplierName;
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/contract/entity/PurchaseContractMaterial.java

@@ -1,65 +0,0 @@
-/*
- *      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.contract.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import com.fjhx.base.BaseStockEntity;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 供应商收款账户实体类
- *
- * @author BladeX
- * @since 2022-07-27
- */
-@Data
-@TableName("stock_purchase_contract_material")
-@ApiModel(value = "PurchaseContractMaterial对象", description = "供应商收款账户")
-public class PurchaseContractMaterial extends BaseStockEntity {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 采购合同ID
-	*/
-	@ApiModelProperty(value = "采购合同ID")
-	private String purchaseContractId;
-	/**
-	* 物料ID
-	*/
-	@ApiModelProperty(value = "物料ID")
-	private String materialId;
-	/**
-	* 采购数量
-	*/
-	@ApiModelProperty(value = "采购数量")
-	private BigDecimal purchaseQty;
-	/**
-	* 单价
-	*/
-	@ApiModelProperty(value = "单价")
-	private BigDecimal price;
-	/**
-	* 金额
-	*/
-	@ApiModelProperty(value = "金额")
-	private BigDecimal totalAmount;
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/contract/entity/PurchaseContractbatch.java

@@ -1,62 +0,0 @@
-/*
- *      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.contract.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-
-import com.fjhx.base.BaseStockEntity;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 采购批次号实体类
- *
- * @author BladeX
- * @since 2022-07-29
- */
-@Data
-@TableName("stock_purchase_contractbatch")
-@ApiModel(value = "PurchaseContractbatch对象", description = "采购批次号")
-public class PurchaseContractbatch extends BaseStockEntity {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 批次号
-	*/
-	@ApiModelProperty(value = "批次号")
-	private String batchNo;
-	/**
-	* 采购合同单号
-	*/
-	@ApiModelProperty(value = "采购合同单号")
-	private String purchaseBillNo;
-	/**
-	* 出货时间
-	*/
-	@ApiModelProperty(value = "出货时间")
-	private LocalDateTime shipTime;
-	/**
-	* 合同批次出货状态 （枚举定义：0=未出货，1=已出货）
-	*/
-	@ApiModelProperty(value = "合同批次出货状态 （枚举定义：0=未出货，1=已出货）")
-	private Integer batchShipStatus;
-
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/contract/enums/ApproveStateEnum.java

@@ -1,69 +0,0 @@
-package com.fjhx.contract.enums;
-
-import cn.hutool.core.util.ObjectUtil;
-import org.springblade.core.tool.utils.StringPool;
-
-import java.util.LinkedHashMap;
-
-/**
- * 合同审批状态
- * 枚举定义：0=待审批，1=审批中，2=已审批，3=已驳回，4=已撤回）
- */
-public enum ApproveStateEnum {
-
-    APPLY_PURCHASE_STATUS_0(0, "待审批"),
-    APPLY_PURCHASE_STATUS_1(1, "审批中"),
-    APPLY_PURCHASE_STATUS_2(2, "已审批"),
-    APPLY_PURCHASE_STATUS_3(3, "已驳回"),
-    APPLY_PURCHASE_STATUS_4(4, "已撤回"),
-    ;
-
-    private int key;
-
-    private String value;
-
-    private static LinkedHashMap<Integer, String> map = new LinkedHashMap<>();
-
-    ApproveStateEnum(int key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    /**
-     * 获取枚举map
-     *
-     * @return
-     */
-    public static LinkedHashMap<Integer, String> getMap() {
-        if (ObjectUtil.isNotEmpty(map)) {
-            return map;
-        }
-        for (ApproveStateEnum ms : values()) {
-            map.put(ms.key, ms.value);
-        }
-        return map;
-    }
-
-    /**
-     * 通过key获取名称
-     *
-     * @param key
-     * @return
-     */
-    public static String getNameByKey(Integer key) {
-        if (key == null || key < 0) {
-            return "";
-        }
-        LinkedHashMap<Integer, String> map = getMap();
-        return map.getOrDefault(key, StringPool.EMPTY);
-    }
-
-    public int getKey() {
-        return key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/contract/enums/PurchaseContractStatusEnum.java

@@ -1,67 +0,0 @@
-package com.fjhx.contract.enums;
-
-import cn.hutool.core.util.ObjectUtil;
-import org.springblade.core.tool.utils.StringPool;
-
-import java.util.LinkedHashMap;
-
-/**
- * 合同状态
- */
-public enum PurchaseContractStatusEnum {
-
-    APPLY_PURCHASE_STATUS_0(0, "待确认"),
-    APPLY_PURCHASE_STATUS_1(1, "审批中"),
-    APPLY_PURCHASE_STATUS_2(2, "进行中"),
-    APPLY_PURCHASE_STATUS_3(3, "已完成"),
-    ;
-
-    private int key;
-
-    private String value;
-
-    private static LinkedHashMap<Integer, String> map = new LinkedHashMap<>();
-
-    PurchaseContractStatusEnum(int key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    /**
-     * 获取枚举map
-     *
-     * @return
-     */
-    public static LinkedHashMap<Integer, String> getMap() {
-        if (ObjectUtil.isNotEmpty(map)) {
-            return map;
-        }
-        for (PurchaseContractStatusEnum ms : values()) {
-            map.put(ms.key, ms.value);
-        }
-        return map;
-    }
-
-    /**
-     * 通过key获取名称
-     *
-     * @param key
-     * @return
-     */
-    public static String getNameByKey(Integer key) {
-        if (key == null || key < 0) {
-            return "";
-        }
-        LinkedHashMap<Integer, String> map = getMap();
-        return map.getOrDefault(key, StringPool.EMPTY);
-    }
-
-    public int getKey() {
-        return key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/house/entity/House.java

@@ -1,54 +0,0 @@
-/*
- *      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.house.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import com.fjhx.base.BaseStockEntity;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 仓库实体类
- *
- * @author BladeX
- * @since 2022-07-21
- */
-@Data
-@TableName("stock_house")
-@ApiModel(value = "House对象", description = "仓库")
-public class House extends BaseStockEntity {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 仓库名称
-	*/
-	@ApiModelProperty(value = "仓库名称")
-	private String name;
-	/**
-	* 备注
-	*/
-	@ApiModelProperty(value = "备注")
-	private String remark;
-	/**
-	* plc编号 （枚举定义：1=一号仓库，2=二号仓库）
-	*/
-	@ApiModelProperty(value = "plc编号 （枚举定义：1=一号仓库，2=二号仓库）")
-	private Integer plcCode;
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/material/entity/Material.java

@@ -1,128 +0,0 @@
-/*
- *      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.material.entity;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import com.fjhx.base.BaseStockEntity;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 物料实体类
- *
- * @author BladeX
- * @since 2022-07-21
- */
-@Data
-@TableName("stock_material")
-@ApiModel(value = "Material对象", description = "物料")
-public class Material extends BaseStockEntity {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 物料名称
-	*/
-	@ApiModelProperty(value = "物料名称")
-	private String name;
-	/**
-	* 编码
-	*/
-	@ApiModelProperty(value = "编码")
-	private String code;
-
-	/**
-	* 分类
-	*/
-	@ApiModelProperty(value = "分类")
-	private String categoryId;
-	/**
-	* 安全库存
-	*/
-	@ApiModelProperty(value = "安全库存")
-	private Integer safetyStock;
-	/**
-	* 抽检⽐例
-	*/
-	@ApiModelProperty(value = "抽检⽐例")
-	private BigDecimal checkRate;
-	/**
-	* 安全预警天数/采购周期
-	*/
-	@ApiModelProperty(value = "安全预警天数/采购周期")
-	private Integer safetyWarnDay;
-
-	/**
-	 * 单位
-	 */
-	@ApiModelProperty(value = "单位")
-	private Integer unit;
-
-	/**
-	* 规格
-	*/
-	@ApiModelProperty(value = "规格")
-	private String spec;
-	/**
-	* 备注
-	*/
-	@ApiModelProperty(value = "备注")
-	private String remark;
-	/**
-	* 标准价格
-	*/
-	@ApiModelProperty(value = "标准价格")
-	private BigDecimal price;
-	/**
-	* 标准库存
-	*/
-	@ApiModelProperty(value = "标准库存")
-	private BigDecimal stockStandard;
-	/**
-	* 用途
-	*/
-	@ApiModelProperty(value = "用途")
-	private String purpose;
-	/**
-	* 工艺类型 （枚举定义：0=直喷，1=热转，2=打纸，3=墨水，4=其他）
-	*/
-	@ApiModelProperty(value = "工艺类型 （枚举定义：0=直喷，1=热转，2=打纸，3=墨水，4=其他）")
-	private Integer technologyType;
-	/**
-	 * 克重
-	 */
-	@ApiModelProperty(value = "克重")
-	@TableField(exist = false)
-	private Float unitWeight;
-	/**
-	 * 门幅
-	 */
-	@ApiModelProperty(value = "门幅")
-	@TableField(exist = false)
-	private Float width;
-
-	/**
-	 * 采购单价
-	 */
-	@TableField(exist = false)
-	private BigDecimal purchasePrice;
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/material/entity/MaterialCategory.java

@@ -1,70 +0,0 @@
-/*
- *      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.material.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import com.fjhx.base.BaseStockEntity;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 物料分类实体类
- *
- * @author BladeX
- * @since 2022-07-21
- */
-@Data
-@TableName("stock_material_category")
-@ApiModel(value = "MaterialCategory对象", description = "物料分类")
-public class MaterialCategory extends BaseStockEntity {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 编码
-	*/
-	@ApiModelProperty(value = "编码")
-	private String code;
-	/**
-	* 名称
-	*/
-	@ApiModelProperty(value = "名称")
-	private String name;
-	/**
-	* 父级ID
-	*/
-	@ApiModelProperty(value = "父级ID")
-	private String parentId;
-	/**
-	* 是否选择
-	*/
-	@ApiModelProperty(value = "是否选择")
-	private Integer isForChose;
-	/**
-	* 仓库
-	*/
-	@ApiModelProperty(value = "仓库")
-	private String warehouse;
-
-	/**
-	 * 该节点的所有上级ID，多个用“,”隔开
-	 */
-	private String ancestors;
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/material/entity/MaterialExtend.java

@@ -1,61 +0,0 @@
-/*
- *      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.material.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 物料扩展实体类
- *
- * @author BladeX
- * @since 2022-07-21
- */
-@Data
-@TableName("stock_material_extend")
-@ApiModel(value = "MaterialExtend对象", description = "物料")
-public class MaterialExtend implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 主键ID
-	*/
-	@ApiModelProperty(value = "主键ID")
-	private String id;
-	/**
-	* 物料ID
-	*/
-	@ApiModelProperty(value = "物料ID")
-	private String materialId;
-	/**
-	* 克重
-	*/
-	@ApiModelProperty(value = "克重")
-	private Float unitWeight;
-	/**
-	* 门幅
-	*/
-	@ApiModelProperty(value = "门幅")
-	private Float width;
-
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/material/enums/TechnologtTypeEnum.java

@@ -1,70 +0,0 @@
-package com.fjhx.material.enums;
-
-import cn.hutool.core.util.ObjectUtil;
-import org.springblade.core.tool.utils.StringPool;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 物料工艺类型
- * 0=直喷，1=热转，2=打纸，3=墨水，4=其他）
- */
-public enum TechnologtTypeEnum {
-
-    type_1(0, "直喷"),
-    type_2(1, "热转"),
-    type_3(2, "打纸"),
-    type_4(3, "墨水"),
-    type_5(4, "其他"),
-    ;
-
-    private int key;
-
-    private String value;
-
-    private static Map<Integer, String> map = new HashMap<>();
-
-    TechnologtTypeEnum(int key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    /**
-     * 获取枚举map
-     *
-     * @return
-     */
-    public static Map<Integer, String> getMap() {
-        if (ObjectUtil.isNotEmpty(map)) {
-            return map;
-        }
-        for (TechnologtTypeEnum ms : values()) {
-            map.put(ms.key, ms.value);
-        }
-        return map;
-    }
-
-    /**
-     * 通过key获取名称
-     *
-     * @param key
-     * @return
-     */
-    public static String getNameByKey(Integer key) {
-        if (key == null || key < 0) {
-            return StringPool.EMPTY;
-        }
-        Map<Integer, String> map = getMap();
-        return map.getOrDefault(key, StringPool.EMPTY);
-    }
-
-    public int getKey() {
-        return key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/subscribe/entity/ApplyPurchase.java

@@ -1,100 +0,0 @@
-/*
- *      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.subscribe.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-import java.util.List;
-
-import com.fjhx.base.BaseStockEntity;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 申购单实体类
- *
- * @author BladeX
- * @since 2022-07-26
- */
-@Data
-@TableName("stock_apply_purchase")
-@ApiModel(value = "ApplyPurchase对象", description = "申购单")
-public class ApplyPurchase extends BaseStockEntity {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 申购单号
-	*/
-	@ApiModelProperty(value = "申购单号")
-	private String applyBillNo;
-	/**
-	* 申购部门
-	*/
-	@ApiModelProperty(value = "申购部门")
-	private String departName;
-	/**
-	* 申请时间
-	*/
-	@ApiModelProperty(value = "申请时间")
-	private Date applyTime;
-	/**
-	* 申购说明
-	*/
-	@ApiModelProperty(value = "申购说明")
-	private String applyAccount;
-	/**
-	* 申购类型 （枚举定义：0=物料，1=行政）
-	*/
-	@ApiModelProperty(value = "申购类型 （枚举定义：0=物料，1=行政）")
-	private Integer applyPurType;
-	/**
-	* 申购内容
-	*/
-	@ApiModelProperty(value = "申购内容")
-	private String purchaseContent;
-	/**
-	* 审批状态 （枚举定义：0=待审批，1=审批中，2=已审批，3=已驳回，4=已撤回）
-	*/
-	@ApiModelProperty(value = "审批状态 （枚举定义：0=待审批，1=审批中，2=已审批，3=已驳回，4=已撤回）")
-	private Integer approveBillState;
-	/**
-	* 审核时间
-	*/
-	@ApiModelProperty(value = "审核时间")
-	private Date approvalTime;
-	/**
-	* 安全库存自动生成
-	*/
-	@ApiModelProperty(value = "安全库存自动生成")
-	private Boolean safetyStockCreate;
-
-	/**
-	 * 用户名
-	 */
-	@TableField(exist = false)
-	private String userName;
-
-	/**
-	 * 申购明细
-	 */
-	@TableField(exist = false)
-	private List<ApplyPurchasedetail> purchasedetailList;
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/subscribe/entity/ApplyPurchasedetail.java

@@ -1,62 +0,0 @@
-/*
- *      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.subscribe.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import com.fjhx.base.BaseStockEntity;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 申购单明细实体类
- *
- * @author BladeX
- * @since 2022-07-26
- */
-@Data
-@TableName("stock_apply_purchasedetail")
-@ApiModel(value = "ApplyPurchasedetail对象", description = "申购单明细")
-public class ApplyPurchasedetail extends BaseStockEntity {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 申购ID
-	*/
-	@ApiModelProperty(value = "申购ID")
-	private String applyPurchaseId;
-	/**
-	* 物料Code
-	*/
-	@ApiModelProperty(value = "物料ID")
-	private String materialId;
-	/**
-	* 申购数量
-	*/
-	@ApiModelProperty(value = "申购数量")
-	private BigDecimal purchaseQty;
-	/**
-	* 用途
-	*/
-	@ApiModelProperty(value = "用途")
-	private String purpose;
-
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/subscribe/enums/ApplyPurchaseStatusEnum.java

@@ -1,69 +0,0 @@
-package com.fjhx.subscribe.enums;
-
-import cn.hutool.core.util.ObjectUtil;
-import org.springblade.core.tool.utils.StringPool;
-
-import java.util.LinkedHashMap;
-
-/**
- * 申购单状态
- * 枚举定义：0=待审批，1=审批中，2=已审批，3=已驳回，4=已撤回）
- */
-public enum ApplyPurchaseStatusEnum {
-
-    APPLY_PURCHASE_STATUS_0(0, "待审批"),
-    APPLY_PURCHASE_STATUS_1(1, "审批中"),
-    APPLY_PURCHASE_STATUS_2(2, "已审批"),
-    APPLY_PURCHASE_STATUS_3(3, "已驳回"),
-    APPLY_PURCHASE_STATUS_4(4, "已撤回"),
-    ;
-
-    private int key;
-
-    private String value;
-
-    private static LinkedHashMap<Integer, String> map = new LinkedHashMap<>();
-
-    ApplyPurchaseStatusEnum(int key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    /**
-     * 获取枚举map
-     *
-     * @return
-     */
-    public static LinkedHashMap<Integer, String> getMap() {
-        if (ObjectUtil.isNotEmpty(map)) {
-            return map;
-        }
-        for (ApplyPurchaseStatusEnum ms : values()) {
-            map.put(ms.key, ms.value);
-        }
-        return map;
-    }
-
-    /**
-     * 通过key获取名称
-     *
-     * @param key
-     * @return
-     */
-    public static String getNameByKey(Integer key) {
-        if (key == null || key < 0) {
-            return "";
-        }
-        LinkedHashMap<Integer, String> map = getMap();
-        return map.getOrDefault(key, StringPool.EMPTY);
-    }
-
-    public int getKey() {
-        return key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/supplier/entity/Supplier.java

@@ -1,267 +0,0 @@
-/*
- *      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.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-import com.fjhx.base.BaseStockEntity;
-import com.fjhx.attachment.StockAttachment;
-import lombok.Data;
-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 Date 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;
-
-	/**
-	 * 联系人
-	 */
-	@TableField(exist = false)
-	private List<SupplierContacts> contactsList;
-
-	/**
-	 * 文件列表
-	 */
-	@TableField(exist = false)
-	private List<StockAttachment> attr;
-
-	/**
-	 * 维护记录
-	 */
-	@TableField(exist = false)
-	private List<SupplierKeep> keepList;
-
-	/**
-	 * 账户信息
-	 */
-	@TableField(exist = false)
-	private List<SupplierBank> bankList;
-
-
-	/**
-	 * 问题反馈条数
-	 */
-	@TableField(exist = false)
-	private Integer warningCount;
-
-	/**
-	 * 问题反馈类型总条数
-	 */
-	@TableField(exist = false)
-	private Integer warningTypeCount;
-
-	/**
-	 * 物料类型名称
-	 */
-	@TableField(exist = false)
-	private String categoryName;
-
-	/**
-	 * 物料类型名称
-	 */
-	@TableField(exist = false)
-	private String materialName;
-
-	/**
-	 * 物料分类名称
-	 */
-	@TableField(exist = false)
-	private String materialCategoryName;
-
-	/**
-	 * 分类条数
-	 */
-	@TableField(exist = false)
-	private Integer CategoryCount;
-
-	/**
-	 * 物料分类ID
-	 */
-	@TableField(exist = false)
-	private String materialCategoryId;
-
-	/**
-	 * 工艺类型 （枚举定义：0=直喷，1=热转，2=打纸，3=墨水，4=其他）
-	 */
-	@TableField(exist = false)
-	private Integer technologyType;
-
-	/**
-	 * 物料用途
-	 */
-	@TableField(exist = false)
-	private String purpose;
-
-	/**
-	 * 采购占比
-	 */
-	@TableField(exist = false)
-	private BigDecimal purProportion;
-	/**
-	 * 总金额
-	 */
-	@TableField(exist = false)
-	private String sumMoney;
-
-	/**
-	 * 去年金额
-	 */
-	@TableField(exist = false)
-	private String lastYearMoney;
-
-	/**
-	 * 今年金额
-	 */
-	@TableField(exist = false)
-	private String yearMoney;
-
-	/**
-	 * 上个月金额
-	 */
-	@TableField(exist = false)
-	private String lastMonthMoney;
-
-	/**
-	 * 本月金额
-	 */
-	@TableField(exist = false)
-	private String monthMoney;
-
-	/**
-	 * 条数
-	 */
-	@TableField(exist = false)
-	private Integer count;
-
-	/**
-	 * 金额
-	 */
-	@TableField(exist = false)
-	private BigDecimal money;
-
-	/**
-	 * 供应商价格
-	 */
-	@TableField(exist = false)
-	private BigDecimal price;
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/supplier/entity/SupplierBank.java

@@ -1,71 +0,0 @@
-/*
- *      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.fjhx.base.BaseStockEntity;
-import lombok.Data;
-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;
-
-	/**
-	 * 供应商ID
-	 */
-	private String supplierId;
-	/**
-	* 账户名称
-	*/
-	@ApiModelProperty(value = "账户名称")
-	private String bankAccoutName;
-	/**
-	* 户名
-	*/
-	@ApiModelProperty(value = "户名")
-	private String accoutName;
-	/**
-	* 开户行
-	*/
-	@ApiModelProperty(value = "开户行")
-	private String openBank;
-	/**
-	* 账号
-	*/
-	@ApiModelProperty(value = "账号")
-	private String bankAccout;
-
-
-	/**
-	 * 状态
-	 */
-	private Integer status;
-
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/supplier/entity/SupplierContacts.java

@@ -1,71 +0,0 @@
-/*
- *      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.fjhx.base.BaseStockEntity;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 供应商联系人实体类
- *
- * @author BladeX
- * @since 2022-07-25
- */
-@Data
-@TableName("stock_supplier_contacts")
-@ApiModel(value = "SupplierContacts对象", description = "供应商联系人")
-public class SupplierContacts extends BaseStockEntity {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 供应商ID
-	 */
-	private String supplierId;
-
-	/**
-	* 联系人
-	*/
-	@ApiModelProperty(value = "联系人")
-	private String linkMen;
-	/**
-	* 手机
-	*/
-	@ApiModelProperty(value = "手机")
-	private String mobile;
-	/**
-	* 电话
-	*/
-	@ApiModelProperty(value = "电话")
-	private String telephone;
-	/**
-	* 邮箱
-	*/
-	@ApiModelProperty(value = "邮箱")
-	private String email;
-	/**
-	* 传真
-	*/
-	@ApiModelProperty(value = "传真")
-	private String fax;
-
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/supplier/entity/SupplierKeep.java

@@ -1,56 +0,0 @@
-/*
- *      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.fjhx.base.BaseStockEntity;
-import lombok.Data;
-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-service-api/storage-restructure-api/src/main/java/com/fjhx/supplier/entity/SupplierPrice.java

@@ -1,62 +0,0 @@
-/*
- *      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.fjhx.base.BaseStockEntity;
-import lombok.Data;
-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;
-	/**
-	* 物料ID
-	*/
-	@ApiModelProperty(value = "物料ID")
-	private String materialId;
-	/**
-	* 采购单价
-	*/
-	@ApiModelProperty(value = "采购单价")
-	private BigDecimal price;
-
-	/**
-	 * 备注
-	 */
-	private String remark;
-
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/supplier/entity/SupplierProblem.java

@@ -1,72 +0,0 @@
-/*
- *      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.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.List;
-
-import com.fjhx.base.BaseStockEntity;
-import com.fjhx.attachment.StockAttachment;
-import lombok.Data;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 供应商面料问题反馈表实体类
- *
- * @author BladeX
- * @since 2022-07-25
- */
-@Data
-@TableName("stock_supplier_problem")
-public class SupplierProblem extends BaseStockEntity {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 供应商ID
-	*/
-	@ApiModelProperty(value = "供应商ID")
-	private String supplierId;
-	/**
-	* 物料ID
-	*/
-	@ApiModelProperty(value = "物料ID")
-	private String materialId;
-	/**
-	* 问题条数
-	*/
-	@ApiModelProperty(value = "问题条数")
-	private Integer problemTypeCount;
-	/**
-	* 问题类型  逗号分隔
-	*/
-	@ApiModelProperty(value = "问题类型  逗号分隔")
-	private String problemType;
-	/**
-	* 备注信息
-	*/
-	@ApiModelProperty(value = "备注信息")
-	private String remark;
-
-	/**
-	 * 文件合集
-	 */
-	@TableField(exist = false)
-	private List<StockAttachment> attr;
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/tag/entity/Tag.java

@@ -1,115 +0,0 @@
-/*
- *      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.tag.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import com.fjhx.base.BaseStockEntity;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 物料库存明细实体类
- *
- * @author BladeX
- * @since 2022-07-29
- */
-@Data
-@TableName("stock_tag")
-@ApiModel(value = "Tag对象", description = "物料库存明细")
-public class Tag extends BaseStockEntity {
-
-	private static final long serialVersionUID = 1L;
-
-
-	/**
-	* 物料ID
-	*/
-	@ApiModelProperty(value = "物料ID")
-	private String materialId;
-	/**
-	* 物料数量
-	*/
-	@ApiModelProperty(value = "物料数量")
-	private BigDecimal quantity;
-	/**
-	* 二维码
-	*/
-	@ApiModelProperty(value = "二维码")
-	private String qrCode;
-	/**
-	* RFID码
-	*/
-	@ApiModelProperty(value = "RFID码")
-	private String rfidCode;
-	/**
-	* 入库编号
-	*/
-	@ApiModelProperty(value = "入库编号")
-	@TableField("stockIn_out_bill_no")
-	private String stockinOutBillNo;
-	/**
-	* 采购合同ID
-	*/
-	@ApiModelProperty(value = "采购合同ID")
-	private String purchaseContractId;
-	/**
-	* 已打印
-	*/
-	@ApiModelProperty(value = "已打印")
-	private Boolean hadPrinter;
-	/**
-	* 已出货
-	*/
-	@ApiModelProperty(value = "已出货")
-	private Boolean hadShipment;
-	/**
-	* 采购进度 （枚举定义：0=供应商打码，1=供应商出货，2=到货贴标，3=本厂入库，4=现场回仓）
-	*/
-	@ApiModelProperty(value = "采购进度 （枚举定义：0=供应商打码，1=供应商出货，2=到货贴标，3=本厂入库，4=现场回仓）")
-	private Integer purchaseProgress;
-	/**
-	* 出货物流Id
-	*/
-	@ApiModelProperty(value = "出货物流Id")
-	private String expressId;
-	/**
-	* 贴标人
-	*/
-	@ApiModelProperty(value = "贴标人")
-	private String labelUserId;
-	/**
-	* 序号
-	*/
-	@ApiModelProperty(value = "序号")
-	private Integer number;
-	/**
-	* 合同批次ID
-	*/
-	@ApiModelProperty(value = "合同批次ID")
-	private String batchId;
-	/**
-	* 质检状态 （枚举定义：0=未质检，1=已质检，2=无需质检）
-	*/
-	@ApiModelProperty(value = "质检状态 （枚举定义：0=未质检，1=已质检，2=无需质检）")
-	private Integer quantityCheckState;
-
-
-}

hx-service/iot-management/src/main/java/com/fjhx/material/service/impl/MaterialExServiceImpl.java → hx-service/iot-management/src/main/java/com/fjhx/service/material/impl/MaterialExServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.material.service.impl;
+package com.fjhx.service.material.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;

hx-service/pom.xml

@@ -22,8 +22,9 @@
 
     <modules>
         <module>iot-management</module>
-        <module>storage</module>
         <module>iot-production</module>
+        <module>storage</module>
+        <module>storage-restructure</module>
     </modules>
 
     <dependencyManagement>

hx-service/storage-restructure/src/main/java/com/fjhx/attachment/controller/StockAttachmentController.java

@@ -1,54 +0,0 @@
-package com.fjhx.attachment.controller;
-
-import com.fjhx.attachment.StockAttachmentVo;
-import com.fjhx.attachment.service.StockAttachmentService;
-import org.springblade.core.tool.api.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * <p>
- * 业务附件表 前端控制器
- * </p>
- *
- * @author ${author}
- * @since 2022-07-12
- */
-@RestController
-@RequestMapping("/stockAttachment")
-public class StockAttachmentController {
-
-    @Autowired
-    private StockAttachmentService stockAttachmentService;
-
-    @PostMapping("/add")
-    public R add(@RequestBody StockAttachmentVo stockAttachmentVo) {
-        stockAttachmentService.add(stockAttachmentVo);
-        return R.success();
-    }
-
-    @PostMapping("/edit")
-    public R edit(@RequestBody StockAttachmentVo stockAttachmentVo) {
-        stockAttachmentService.edit(stockAttachmentVo);
-        return R.success();
-    }
-
-    @PostMapping("/delete")
-    public R delete(@RequestBody StockAttachmentVo stockAttachmentVo) {
-        stockAttachmentService.delete(stockAttachmentVo);
-        return R.success();
-    }
-
-    /**
-     * 根据业务ID查询文件列表
-     *
-     * @param busi
-     * @return
-     */
-    @GetMapping("/getListByBusi")
-    public R getListByBusi(@RequestParam("busi") String busi) {
-        return R.success(stockAttachmentService.getListByBusi(busi));
-    }
-
-}
-

hx-service/storage-restructure/src/main/java/com/fjhx/attachment/mapper/StockAttachmentMapper.java

@@ -1,16 +0,0 @@
-package com.fjhx.attachment.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fjhx.attachment.StockAttachment;
-
-/**
- * <p>
- * 业务附件表 Mapper 接口
- * </p>
- *
- * @author ${author}
- * @since 2022-07-12
- */
-public interface StockAttachmentMapper extends BaseMapper<StockAttachment> {
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/attachment/mapper/StockAttachmentMapper.xml

@@ -1,5 +0,0 @@
-<?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.attachment.mapper.StockAttachmentMapper">
-
-</mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/attachment/service/StockAttachmentService.java

@@ -1,31 +0,0 @@
-package com.fjhx.attachment.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.attachment.StockAttachment;
-import com.fjhx.attachment.StockAttachmentVo;
-import org.springblade.core.mp.base.BaseService;
-import java.util.List;
-
-/**
- * <p>
- * 业务附件表 服务类
- * </p>
- *
- * @author ${author}
- * @since 2022-07-12
- */
-public interface StockAttachmentService extends IService<StockAttachment> {
-
-    void add(StockAttachmentVo stockAttachmentVo);
-
-    void edit(StockAttachmentVo stockAttachmentVo);
-
-    void delete(StockAttachmentVo stockAttachmentVo);
-
-    /**
-     * 根据业务ID查询文件
-     * @param busi
-     * @return
-     */
-    List<StockAttachment> getListByBusi(String busi);
-}

hx-service/storage-restructure/src/main/java/com/fjhx/attachment/service/impl/StockAttachmentServiceImpl.java

@@ -1,87 +0,0 @@
-package com.fjhx.attachment.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.attachment.StockAttachment;
-import com.fjhx.attachment.StockAttachmentVo;
-import com.fjhx.attachment.mapper.StockAttachmentMapper;
-import com.fjhx.attachment.service.StockAttachmentService;
-import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.tool.utils.StringUtil;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 业务附件表 服务实现类
- * </p>
- *
- * @author ${author}
- * @since 2022-07-12
- */
-@Service
-public class StockAttachmentServiceImpl extends ServiceImpl<StockAttachmentMapper, StockAttachment> implements StockAttachmentService {
-
-    /**
-     * 添加
-     *
-     * @param stockAttachmentVo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void add(StockAttachmentVo stockAttachmentVo) {
-        if (StringUtil.isEmpty(stockAttachmentVo.getBusiId()) || StringUtil.isEmpty(stockAttachmentVo.getPath())) {
-            throw new ServiceException("参数异常");
-        }
-        stockAttachmentVo.setCreatedTime(new Date());
-        save(stockAttachmentVo);
-    }
-
-    /**
-     * 修改
-     *
-     * @param stockAttachmentVo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void edit(StockAttachmentVo stockAttachmentVo) {
-        if (StringUtil.isEmpty(stockAttachmentVo.getId())) {
-            throw new ServiceException("参数异常");
-        }
-        updateById(stockAttachmentVo);
-    }
-
-    /**
-     * 删除
-     *
-     * @param stockAttachmentVo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void delete(StockAttachmentVo stockAttachmentVo) {
-        if (StringUtil.isEmpty(stockAttachmentVo.getId())) {
-            throw new ServiceException("参数异常");
-        }
-        removeById(stockAttachmentVo.getId());
-    }
-
-    /**
-     * 根据业务ID查询文件
-     *
-     * @param busi
-     * @return
-     */
-    @Override
-    public List<StockAttachment> getListByBusi(String busi) {
-        if (StringUtil.isEmpty(busi)) {
-            throw new ServiceException("参数异常");
-        }
-//        rocketMqService.send("topic-ws","tag-ws","",busi, Collections.singletonList("1123598821738675202")
-//                ,"你有一条消息",MessageNoticeEnum.MESSAGE_NOTICE_TYPE_1.getKey());
-        return list(Wrappers.<StockAttachment>query().lambda().eq(StockAttachment::getBusiId, busi));
-    }
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/config/controller/ConfigController.java

@@ -1,89 +0,0 @@
-/*
- *      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.config.controller;
-
-import com.fjhx.config.entity.BasicsConfig;
-import com.fjhx.config.service.IConfigService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
-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 javax.validation.Valid;
-
-/**
- * 配置 控制器
- *
- * @author BladeX
- * @since 2022-07-21
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/config")
-@Api(value = "仓库", tags = "仓库接口")
-public class ConfigController extends BladeController {
-
-    private final IConfigService configService;
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<BasicsConfig> detail(BasicsConfig config) {
-        BasicsConfig detail = configService.getOne(Condition.getQueryWrapper(config));
-        return R.data(detail);
-    }
-
-    /**
-     * 详情
-     */
-    @PostMapping("/submit")
-    public R submit(@RequestBody BasicsConfig config) {
-        configService.submit(config);
-        return R.success();
-    }
-
-    /**
-     * 新增 仓库
-     */
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody BasicsConfig config) {
-        return R.status(configService.save(config));
-    }
-
-    /**
-     * 修改 仓库
-     */
-    @PostMapping("/update")
-    public R update(@Valid @RequestBody BasicsConfig config) {
-        return R.status(configService.updateById(config));
-    }
-
-    /**
-     * 删除 仓库
-     */
-    @PostMapping("/remove")
-    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        return R.status(configService.removeByIds(Func.toLongList(ids)));
-    }
-
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/config/mapper/ConfigMapper.java

@@ -1,30 +0,0 @@
-/*
- *      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.config.mapper;
-
-import com.fjhx.config.entity.BasicsConfig;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 配置 Mapper 接口
- *
- * @author BladeX
- * @since 2022-07-21
- */
-public interface ConfigMapper extends BaseMapper<BasicsConfig> {
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/config/mapper/ConfigMapper.xml

@@ -1,17 +0,0 @@
-<?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.config.mapper.ConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <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"/>
-        <result column="c_value" property="cValue"/>
-        <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-service/storage-restructure/src/main/java/com/fjhx/config/service/IConfigService.java

@@ -1,35 +0,0 @@
-/*
- *      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.config.service;
-
-import com.fjhx.config.entity.BasicsConfig;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 配置 服务类
- *
- * @author BladeX
- * @since 2022-07-21
- */
-public interface IConfigService extends IService<BasicsConfig> {
-
-    /**
-     * 提交
-     * @param config
-     */
-    void submit(BasicsConfig config);
-}

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

@@ -1,60 +0,0 @@
-/*
- *      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.config.service.impl;
-
-import com.alibaba.cloud.commons.lang.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.config.entity.BasicsConfig;
-import com.fjhx.config.mapper.ConfigMapper;
-import com.fjhx.config.service.IConfigService;
-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;
-
-/**
- * 配置 服务实现类
- *
- * @author BladeX
- * @since 2022-07-21
- */
-@Service
-public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, BasicsConfig> implements IConfigService {
-
-    /**
-     * 提交
-     *
-     * @param config
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void submit(BasicsConfig config) {
-        if (StringUtils.isEmpty(config.getCkey())) {
-            throw new ServiceException("参数异常");
-        }
-        BasicsConfig c = getOne(Wrappers.<BasicsConfig>query().lambda().eq(BasicsConfig::getCkey, config.getCkey()));
-        if (ObjectUtil.isNotEmpty(c)) {//修改
-            config.setUpdate();
-            update(config, Wrappers.<BasicsConfig>query().lambda().eq(BasicsConfig::getCkey, config.getCkey()));
-        } else {//添加
-            config.setCreate();
-            save(config);
-        }
-    }
-
-}

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

@@ -1,90 +0,0 @@
-/*
- *      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.contract.controller;
-
-import com.fjhx.contract.entity.PurchaseContract;
-import com.fjhx.contract.service.IPurchaseContractService;
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import org.springblade.common.utils.ListPageMap;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 采购合同 控制器
- *
- * @author BladeX
- * @since 2022-07-27
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/purchasecontract")
-@Api(value = "采购合同", tags = "采购合同接口")
-public class PurchaseContractController extends BladeController {
-
-    private final IPurchaseContractService purchaseContractService;
-
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping("/list")
-    public R list(@RequestBody Map<String, Object> condition) {
-        ListPageMap.getListPageMap(condition);
-        List<PurchaseContract> result = purchaseContractService.getList(condition);
-        return R.success(result);
-    }
-
-    /**
-     * 列表条数
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping("/list/count")
-    public R listCount(@RequestBody Map<String, Object> condition) {
-        ListPageMap.getListPageMap(condition);
-        Integer count = purchaseContractService.getListCount(condition);
-        return R.success(count);
-    }
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<PurchaseContract> detail(@RequestParam("id") String id) {
-        PurchaseContract detail = purchaseContractService.getDetail(id);
-        return R.data(detail);
-    }
-
-    /**
-     * 详情
-     */
-    @PostMapping("/statistics/class")
-    public R statisticsClass(@RequestBody Map<String, Object> condition) {
-        List<Map<String, Object>> list = purchaseContractService.statisticsClassify(condition);
-        return R.success(list);
-    }
-
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/contract/controller/PurchaseContractFlowController.java

@@ -1,80 +0,0 @@
-/*
- *      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.contract.controller;
-
-import com.fjhx.contract.entity.PurchaseContract;
-import com.fjhx.contract.service.IPurchaseContractFlowService;
-import com.fjhx.myapp.application.entity.FlowParam;
-import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.api.R;
-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;
-
-/**
- * 合同流程 控制器
- *
- * @author BladeX
- * @since 2022-07-26
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/purchasecontract/flow")
-public class PurchaseContractFlowController extends BladeController {
-
-    private final IPurchaseContractFlowService flowService;
-
-
-    /**
-     * 开始流程
-     *
-     * @param purchaseContract
-     * @return
-     */
-    @PostMapping(value = "/start")
-    public R start(@RequestBody PurchaseContract purchaseContract) {
-        flowService.start(purchaseContract);
-        return R.success();
-    }
-
-    /**
-     * 审核
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping(value = "/examine")
-    public R examine(@RequestBody FlowParam condition) {
-        flowService.examine(condition);
-        return R.success();
-    }
-
-    /**
-     * 回退
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping(value = "/reject")
-    public R reject(@RequestBody FlowParam condition) {
-        flowService.reject(condition);
-        return R.success();
-    }
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/contract/controller/PurchaseContractMaterialController.java

@@ -1,80 +0,0 @@
-/*
- *      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.contract.controller;
-
-import com.fjhx.contract.entity.PurchaseContractMaterial;
-import com.fjhx.contract.service.IPurchaseContractMaterialService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
-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 javax.validation.Valid;
-
-/**
- * 供应商收款账户 控制器
- *
- * @author BladeX
- * @since 2022-07-27
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/purchasecontractmaterial")
-@Api(value = "供应商收款账户", tags = "供应商收款账户接口")
-public class PurchaseContractMaterialController extends BladeController {
-
-    private final IPurchaseContractMaterialService purchaseContractMaterialService;
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<PurchaseContractMaterial> detail(PurchaseContractMaterial purchaseContractMaterial) {
-        PurchaseContractMaterial detail = purchaseContractMaterialService.getOne(Condition.getQueryWrapper(purchaseContractMaterial));
-        return R.data(detail);
-    }
-
-    /**
-     * 新增 供应商收款账户
-     */
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody PurchaseContractMaterial purchaseContractMaterial) {
-        return R.status(purchaseContractMaterialService.save(purchaseContractMaterial));
-    }
-
-    /**
-     * 修改 供应商收款账户
-     */
-    @PostMapping("/update")
-    public R update(@Valid @RequestBody PurchaseContractMaterial purchaseContractMaterial) {
-        return R.status(purchaseContractMaterialService.updateById(purchaseContractMaterial));
-    }
-
-    /**
-     * 删除 供应商收款账户
-     */
-    @PostMapping("/remove")
-    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        return R.status(purchaseContractMaterialService.removeByIds(Func.toLongList(ids)));
-    }
-
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/contract/controller/PurchaseContractbatchController.java

@@ -1,72 +0,0 @@
-/*
- *      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.contract.controller;
-
-import com.fjhx.contract.entity.PurchaseContractbatch;
-import com.fjhx.contract.service.IPurchaseContractbatchService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
-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 javax.validation.Valid;
-
-/**
- * 采购批次号 控制器
- *
- * @author BladeX
- * @since 2022-07-29
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/purchasecontractbatch")
-@Api(value = "采购批次号", tags = "采购批次号接口")
-public class PurchaseContractbatchController extends BladeController {
-
-    private final IPurchaseContractbatchService purchaseContractbatchService;
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<PurchaseContractbatch> detail(PurchaseContractbatch purchaseContractbatch) {
-        PurchaseContractbatch detail = purchaseContractbatchService.getOne(Condition.getQueryWrapper(purchaseContractbatch));
-        return R.data(detail);
-    }
-
-    /**
-     * 新增 采购批次号
-     */
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody PurchaseContractbatch purchaseContractbatch) {
-        return R.status(purchaseContractbatchService.saveContractBatch(purchaseContractbatch));
-    }
-
-    /**
-     * 删除 采购批次号
-     */
-    @PostMapping("/remove")
-    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        return R.status(purchaseContractbatchService.removeByIds(Func.toLongList(ids)));
-    }
-
-
-}

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

@@ -1,63 +0,0 @@
-/*
- *      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.contract.mapper;
-
-import com.fjhx.contract.entity.PurchaseContract;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 采购合同 Mapper 接口
- *
- * @author BladeX
- * @since 2022-07-27
- */
-public interface PurchaseContractMapper extends BaseMapper<PurchaseContract> {
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    List<PurchaseContract> getList(Map<String, Object> condition);
-
-    /**
-     * 列表-总条数
-     *
-     * @param condition
-     * @return
-     */
-    Integer getListCount(Map<String, Object> condition);
-
-    /**
-     * 获取详情
-     * @param id
-     * @return
-     */
-    PurchaseContract getDetailById(@Param("id") String id);
-
-    /**
-     * 统计表头分类
-     * @param condition
-     * @return
-     */
-    List<Map<String,Object>> getClassByTechnology(Map<String, Object> condition);
-
-}

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

@@ -1,133 +0,0 @@
-<?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.contract.mapper.PurchaseContractMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="purchaseContractResultMap" type="com.fjhx.contract.entity.PurchaseContract">
-        <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="apply_purchase_id" property="applyPurchaseId"/>
-        <result column="purchase_bill_no" property="purchaseBillNo"/>
-        <result column="supplier_id" property="supplierId"/>
-        <result column="deliver_time" property="deliverTime"/>
-        <result column="account_period" property="accountPeriod"/>
-        <result column="tax_value" property="taxValue"/>
-        <result column="invoice_type" property="invoiceType"/>
-        <result column="sign_time" property="signTime"/>
-        <result column="pur_contract_state" property="purContractState"/>
-        <result column="contract_pay_state" property="contractPayState"/>
-        <result column="supplier_ship_state" property="supplierShipState"/>
-        <result column="approve_bill_state" property="approveBillState"/>
-        <result column="approval_time" property="approvalTime"/>
-        <result column="remark" property="remark"/>
-        <result column="adjust_amount" property="adjustAmount"/>
-        <result column="adjust_qty" property="adjustQty"/>
-        <result column="had_pay_amount" property="hadPayAmount"/>
-        <result column="apply_pay_amount" property="applyPayAmount"/>
-        <result column="ret_back_qty" property="retBackQty"/>
-    </resultMap>
-
-    <select id="getList" resultType="com.fjhx.contract.entity.PurchaseContract">
-        SELECT
-            t1.*,
-            t2.purchase_qty AS purchaseQty,
-            t2.price AS purchasePrice,
-            t3.`id` AS materialId,
-            t3.`name` AS materialName,
-            t3.spec AS materialSpec,
-            t3.`code` AS materialCode,
-            t3.technology_type AS technologyType,
-            t4.apply_bill_no AS applyBillNo,
-            t5.`name` AS supplierName
-        FROM
-            stock_purchase_contract t1
-        LEFT JOIN stock_purchase_contract_material t2 ON t1.id = t2.purchase_contract_id
-        LEFT JOIN stock_material t3 ON t2.material_id = t3.id
-        LEFT JOIN stock_apply_purchase t4 ON t1.apply_purchase_id = t4.id
-        LEFT JOIN stock_supplier t5 ON t1.supplier_id = t5.id
-        <include refid="list_condition"/>
-        ORDER BY t1.create_time DESC
-        <include refid="com.fjhx.house.mapper.HouseMapper.sql_limit"/>
-    </select>
-    <select id="getListCount" resultType="java.lang.Integer">
-        SELECT
-            count(1)
-        FROM
-            stock_purchase_contract t1
-        LEFT JOIN stock_purchase_contract_material t2 ON t1.id = t2.purchase_contract_id
-        LEFT JOIN stock_material t3 ON t2.material_id = t3.id
-        LEFT JOIN stock_apply_purchase t4 ON t1.apply_purchase_id = t4.id
-        LEFT JOIN stock_supplier t5 ON t1.supplier_id = t5.id
-        <include refid="list_condition"/>
-        ORDER BY t1.create_time DESC
-        <include refid="com.fjhx.house.mapper.HouseMapper.sql_limit"/>
-    </select>
-    <select id="getDetailById" resultType="com.fjhx.contract.entity.PurchaseContract">
-        SELECT
-            t1.*,
-            t2.purchase_qty AS purchaseQty,
-            t2.price AS purchasePrice,
-            t2.total_amount AS purchaseTotalAmount,
-            t3.`id` AS materialId,
-            t3.unit AS materialUnit,
-            t3.`name` AS materialName,
-            t3.spec AS materialSpec,
-            t3.`code` AS materialCode,
-            t3.remark AS materialRemark,
-            t4.`name` AS supplierName
-        FROM
-            stock_purchase_contract t1
-        LEFT JOIN stock_purchase_contract_material t2 ON t1.id = t2.purchase_contract_id
-        LEFT JOIN stock_material t3 ON t2.material_id = t3.id
-        LEFT JOIN stock_supplier t4 ON t1.supplier_id = t4.id
-        WHERE
-        t1.id = #{id}
-        AND t1.is_delete = 0
-    </select>
-    <select id="getClassByTechnology" resultType="java.util.Map">
-        SELECT
-            t3.technology_type AS technologyType,
-            SUM( t2.total_amount )AS sumMoney
-        FROM
-            stock_purchase_contract t1
-        LEFT JOIN stock_purchase_contract_material t2 ON t1.id = t2.purchase_contract_id
-        LEFT JOIN stock_material t3 ON t2.material_id = t3.id
-        <include refid="class_condition"/>
-        GROUP BY
-            t3.technology_type
-    </select>
-    <sql id="list_condition">
-        <where>
-            t1.is_delete = 0
-            <if test="search neq null and search neq '' ">
-                AND ((INSTR(t1.purchase_bill_no, #{search}) > 0) OR (INSTR(t3.`name`, #{search}) > 0) )
-            </if>
-            <if test="purContractState neq null and purContractState eq 1">
-                AND t1.pur_contract_state in (0,1)
-            </if>
-            <if test="purContractState neq null and purContractState neq 1">
-                AND t1.pur_contract_state = #{purContractState}
-            </if>
-            <if test="technologyType neq null and technologyType neq ''">
-                AND t3.technology_type = #{technologyType}
-            </if>
-        </where>
-
-    </sql>
-    <sql id="class_condition">
-        <where>
-            t1.is_delete = 0
-            <if test="search neq null and search neq '' ">
-                AND ((INSTR(t1.purchase_bill_no, #{search}) > 0) OR (INSTR(t3.`name`, #{search}) > 0) )
-            </if>
-            <if test="technologyType neq null and technologyType neq ''">
-                AND t3.technology_type = #{technologyType}
-            </if>
-        </where>
-
-    </sql>
-</mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/contract/mapper/PurchaseContractMaterialMapper.java

@@ -1,30 +0,0 @@
-/*
- *      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.contract.mapper;
-
-import com.fjhx.contract.entity.PurchaseContractMaterial;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- * 供应商收款账户 Mapper 接口
- *
- * @author BladeX
- * @since 2022-07-27
- */
-public interface PurchaseContractMaterialMapper extends BaseMapper<PurchaseContractMaterial> {
-}

hx-service/storage-restructure/src/main/java/com/fjhx/contract/mapper/PurchaseContractMaterialMapper.xml

@@ -1,21 +0,0 @@
-<?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.contract.mapper.PurchaseContractMaterialMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="purchaseContractMaterialResultMap" type="com.fjhx.contract.entity.PurchaseContractMaterial">
-        <id column="id" property="id"/>
-        <result column="purchase_contract_id" property="purchaseContractId"/>
-        <result column="material_id" property="materialId"/>
-        <result column="purchase_qty" property="purchaseQty"/>
-        <result column="price" property="price"/>
-        <result column="bank_accout" property="bankAccout"/>
-        <result column="total_amount" property="totalAmount"/>
-        <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-service/storage-restructure/src/main/java/com/fjhx/contract/mapper/PurchaseContractbatchMapper.java

@@ -1,30 +0,0 @@
-/*
- *      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.contract.mapper;
-
-import com.fjhx.contract.entity.PurchaseContractbatch;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 采购批次号 Mapper 接口
- *
- * @author BladeX
- * @since 2022-07-29
- */
-public interface PurchaseContractbatchMapper extends BaseMapper<PurchaseContractbatch> {
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/contract/mapper/PurchaseContractbatchMapper.xml

@@ -1,19 +0,0 @@
-<?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.contract.mapper.PurchaseContractbatchMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="purchaseContractbatchResultMap" type="com.fjhx.contract.entity.PurchaseContractbatch">
-        <id column="id" property="id"/>
-        <result column="batch_no" property="batchNo"/>
-        <result column="purchase_bill_no" property="purchaseBillNo"/>
-        <result column="ship_time" property="shipTime"/>
-        <result column="batch_ship_status" property="batchShipStatus"/>
-        <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-service/storage-restructure/src/main/java/com/fjhx/contract/service/IPurchaseContractFlowService.java

@@ -1,51 +0,0 @@
-/*
- *      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.contract.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.contract.entity.PurchaseContract;
-import com.fjhx.myapp.application.entity.FlowParam;
-
-/**
- * 合同流程 服务类
- *
- * @author BladeX
- * @since 2022-07-26
- */
-public interface IPurchaseContractFlowService extends IService<PurchaseContract> {
-
-    /**
-     * 开始流程
-     *
-     * @param purchaseContract
-     */
-    void start(PurchaseContract purchaseContract);
-
-    /**
-     * 审核
-     *
-     * @param condition
-     */
-    void examine(FlowParam condition);
-
-    /**
-     * 驳回
-     *
-     * @param condition
-     */
-    void reject(FlowParam condition);
-}

hx-service/storage-restructure/src/main/java/com/fjhx/contract/service/IPurchaseContractMaterialService.java

@@ -1,30 +0,0 @@
-/*
- *      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.contract.service;
-
-import com.fjhx.contract.entity.PurchaseContractMaterial;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 供应商收款账户 服务类
- *
- * @author BladeX
- * @since 2022-07-27
- */
-public interface IPurchaseContractMaterialService extends IService<PurchaseContractMaterial> {
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/contract/service/IPurchaseContractService.java

@@ -1,69 +0,0 @@
-/*
- *      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.contract.service;
-
-import com.fjhx.contract.entity.PurchaseContract;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.supplier.entity.Supplier;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 采购合同 服务类
- *
- * @author BladeX
- * @since 2022-07-27
- */
-public interface IPurchaseContractService extends IService<PurchaseContract> {
-
-    /**
-     * 添加合同
-     * @param purchaseContract
-     * @return
-     */
-    Boolean savePurchaseContract(PurchaseContract purchaseContract);
-
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    List<PurchaseContract> getList(Map<String, Object> condition);
-
-    /**
-     * 列表-总条数
-     *
-     * @param condition
-     * @return
-     */
-    Integer getListCount(Map<String, Object> condition);
-
-    /**
-     * 详情
-     * @return
-     */
-    PurchaseContract getDetail(String id);
-
-
-    /**
-     * 表头分类
-     * @return
-     */
-    List<Map<String,Object>> statisticsClassify(Map<String, Object> condition);
-}

hx-service/storage-restructure/src/main/java/com/fjhx/contract/service/IPurchaseContractbatchService.java

@@ -1,36 +0,0 @@
-/*
- *      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.contract.service;
-
-import com.fjhx.contract.entity.PurchaseContractbatch;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 采购批次号 服务类
- *
- * @author BladeX
- * @since 2022-07-29
- */
-public interface IPurchaseContractbatchService extends IService<PurchaseContractbatch> {
-
-    /**
-     * 添加
-     * @param purchaseContractbatch
-     * @return
-     */
-    Boolean saveContractBatch(PurchaseContractbatch purchaseContractbatch);
-}

hx-service/storage-restructure/src/main/java/com/fjhx/contract/service/impl/PurchaseContractFlowServiceImpl.java

@@ -1,156 +0,0 @@
-/*
- *      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.contract.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.contract.entity.PurchaseContract;
-import com.fjhx.contract.entity.PurchaseContractMaterial;
-import com.fjhx.contract.enums.PurchaseContractStatusEnum;
-import com.fjhx.contract.mapper.PurchaseContractMapper;
-import com.fjhx.contract.service.IPurchaseContractFlowService;
-import com.fjhx.contract.service.IPurchaseContractMaterialService;
-import com.fjhx.myapp.application.entity.FlowParam;
-import com.fjhx.myapp.application.enums.FlowTypeEnum;
-import com.fjhx.myapp.application.feign.IFlowApi;
-import com.fjhx.subscribe.enums.ApplyPurchaseStatusEnum;
-import com.fjhx.supplier.entity.Supplier;
-import com.fjhx.supplier.service.ISupplierService;
-import org.springblade.common.utils.DateUtil;
-import org.springblade.core.log.exception.ServiceException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.Date;
-
-/**
- * 采购合同 服务实现类
- *
- * @author BladeX
- * @since 2022-07-27
- */
-@Service
-public class PurchaseContractFlowServiceImpl extends ServiceImpl<PurchaseContractMapper, PurchaseContract> implements IPurchaseContractFlowService {
-
-    @Autowired
-    private IPurchaseContractMaterialService iPurchaseContractMaterialService;
-
-    @Autowired
-    private ISupplierService iSupplierService;
-
-    @Autowired
-    private IFlowApi flowApi;
-
-    /**
-     * 发起
-     *
-     * @param purchaseContract
-     */
-    @Override
-    public void start(PurchaseContract purchaseContract) {
-        if (ObjectUtil.isEmpty(purchaseContract.getSupplierId())) {
-            throw new ServiceException("请选择供应商");
-        }
-        //查询供应商
-        Supplier supplier = iSupplierService.getById(purchaseContract.getSupplierId());
-        //查询合同
-        PurchaseContract contract = getById(purchaseContract.getId());
-        if (ObjectUtil.isEmpty(contract)) {
-            throw new ServiceException("合同不存在");
-        }
-        //计算交货日期  当前时间+供应商账期
-        if (ObjectUtil.isEmpty(supplier.getAccountDate())) {
-            purchaseContract.setDeliverTime(new Date());
-        } else {
-            purchaseContract.setDeliverTime(DateUtil.dateAddASub(new Date(), supplier.getAccountDate()));
-        }
-        purchaseContract.setTaxValue(new BigDecimal("0.13"));
-        purchaseContract.setApproveBillState(ApplyPurchaseStatusEnum.APPLY_PURCHASE_STATUS_1.getKey());
-        purchaseContract.setPurContractState(PurchaseContractStatusEnum.APPLY_PURCHASE_STATUS_1.getKey());
-        updateById(purchaseContract);
-        //修改物料得总价
-        PurchaseContractMaterial material = new PurchaseContractMaterial();
-        material.setTotalAmount(purchaseContract.getPurchaseTotalAmount());
-        material.setPrice(purchaseContract.getPurchasePrice());
-        iPurchaseContractMaterialService.update(material, Wrappers.<PurchaseContractMaterial>query().lambda().eq(PurchaseContractMaterial::getPurchaseContractId, purchaseContract.getId()));
-        String title = "caozj" + " 在" + LocalDate.now() + "日发起了 合同审批流程（单号" + contract.getPurchaseBillNo() + "）";
-        //发起流程
-        FlowParam param = new FlowParam(title, null, null, FlowTypeEnum.type_2.getValue(), purchaseContract.getId());
-        try {
-            flowApi.startFlow(param);
-        } catch (Exception e) {
-            throw new ServiceException("流程异常");
-        }
-    }
-
-    /**
-     * 审批
-     *
-     * @param condition
-     */
-    @Override
-    public void examine(FlowParam condition) {
-        if (!ObjectUtil.isAllNotEmpty(condition.getBusinessId(), condition.getProInstantsId())) {
-            throw new ServiceException("参数缺失");
-        }
-        //查询合同信息
-        PurchaseContract purchaseContract = getById(condition.getBusinessId());
-        if (ObjectUtil.isEmpty(purchaseContract)) {
-            throw new ServiceException("合同不存在");
-        }
-        try {
-            Boolean flowResult = flowApi.examineFlow(condition);
-            if (flowResult) {//流程结束
-                PurchaseContract update = new PurchaseContract();
-                update.setId(condition.getBusinessId());
-                update.setApprovalTime(new Date());
-                update.setPurContractState(PurchaseContractStatusEnum.APPLY_PURCHASE_STATUS_2.getKey());
-                update.setApproveBillState(ApplyPurchaseStatusEnum.APPLY_PURCHASE_STATUS_2.getKey());
-                this.updateById(update);
-            }
-        } catch (Exception e) {
-            throw new ServiceException("流程异常");
-        }
-    }
-
-    /**
-     * 驳回
-     *
-     * @param condition
-     */
-    @Override
-    public void reject(FlowParam condition) {
-        if (!ObjectUtil.isAllNotEmpty(condition.getBusinessId(), condition.getProInstantsId())) {
-            throw new ServiceException("参数缺失");
-        }
-        try {
-            Boolean flowResult = flowApi.rejectFlow(condition);//驳回完后判断流程是否结束。还是转交到上一个节点
-            if (flowResult) {//流程结束
-                PurchaseContract update = new PurchaseContract();
-                update.setId(condition.getBusinessId());
-                update.setApproveBillState(ApplyPurchaseStatusEnum.APPLY_PURCHASE_STATUS_3.getKey());
-                this.updateById(update);
-            }
-        } catch (Exception e) {
-            throw new ServiceException("流程异常");
-        }
-    }
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/contract/service/impl/PurchaseContractMaterialServiceImpl.java

@@ -1,35 +0,0 @@
-/*
- *      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.contract.service.impl;
-
-import com.fjhx.contract.entity.PurchaseContractMaterial;
-import com.fjhx.contract.mapper.PurchaseContractMaterialMapper;
-import com.fjhx.contract.service.IPurchaseContractMaterialService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * 供应商收款账户 服务实现类
- *
- * @author BladeX
- * @since 2022-07-27
- */
-@Service
-public class PurchaseContractMaterialServiceImpl extends ServiceImpl<PurchaseContractMaterialMapper, PurchaseContractMaterial> implements IPurchaseContractMaterialService {
-
-
-}

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

@@ -1,123 +0,0 @@
-/*
- *      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.contract.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fjhx.contract.entity.PurchaseContract;
-import com.fjhx.contract.entity.PurchaseContractMaterial;
-import com.fjhx.contract.mapper.PurchaseContractMapper;
-import com.fjhx.contract.service.IPurchaseContractMaterialService;
-import com.fjhx.contract.service.IPurchaseContractService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.common.utils.CodeUtil;
-import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.core.tool.utils.StringUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 采购合同 服务实现类
- *
- * @author BladeX
- * @since 2022-07-27
- */
-@Service
-public class PurchaseContractServiceImpl extends ServiceImpl<PurchaseContractMapper, PurchaseContract> implements IPurchaseContractService {
-
-    @Autowired
-    private IPurchaseContractMaterialService iPurchaseContractMaterialService;
-    /**
-     * 列表
-     * @param condition
-     * @return
-     * @throws ParseException
-     */
-    @Override
-    public List<PurchaseContract> getList(Map<String, Object> condition){
-        return baseMapper.getList(condition);
-    }
-
-    /**
-     * 列表条数
-     * @param condition
-     * @return
-     */
-    @Override
-    public Integer getListCount(Map<String, Object> condition) {
-        return baseMapper.getListCount(condition);
-    }
-
-    /**
-     * 详情
-     * @param id
-     * @return
-     */
-    @Override
-    public PurchaseContract getDetail(String id) {
-        return baseMapper.getDetailById(id);
-    }
-
-    /**
-     * 统计分类
-     * @param condition
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> statisticsClassify(Map<String, Object> condition) {
-        return baseMapper.getClassByTechnology(condition);
-    }
-
-    /**
-     * 保存合同
-     * @param purchaseContract
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean savePurchaseContract(PurchaseContract purchaseContract) {
-        purchaseContract.setCreate();
-        if(StringUtil.isEmpty(purchaseContract.getPurchaseBillNo())){
-            //生成code
-            PurchaseContract sCode = getOne(Wrappers.<PurchaseContract>query().lambda().orderByDesc(PurchaseContract::getPurchaseBillNo).last("limit 1"));
-            String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
-            String code = "PO-"+date+"-0001";
-            if(ObjectUtil.isEmpty(sCode)){
-                purchaseContract.setPurchaseBillNo(code);
-            }else{
-                purchaseContract.setPurchaseBillNo(sCode.getPurchaseBillNo()==null?code: CodeUtil.generateContractCode(sCode.getPurchaseBillNo()));
-            }
-        }
-        save(purchaseContract);
-        if(CollectionUtils.isNotEmpty(purchaseContract.getMaterialList())){
-            for(PurchaseContractMaterial p:purchaseContract.getMaterialList()){
-                p.setPurchaseContractId(purchaseContract.getId());
-                p.setCreate();
-            }
-            //保存明细
-            iPurchaseContractMaterialService.saveBatch(purchaseContract.getMaterialList());
-        }
-        return true;
-    }
-}

hx-service/storage-restructure/src/main/java/com/fjhx/contract/service/impl/PurchaseContractbatchServiceImpl.java

@@ -1,63 +0,0 @@
-/*
- *      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.contract.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fjhx.contract.entity.PurchaseContractbatch;
-import com.fjhx.contract.mapper.PurchaseContractbatchMapper;
-import com.fjhx.contract.service.IPurchaseContractbatchService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.common.utils.CodeUtil;
-import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.core.tool.utils.StringUtil;
-import org.springframework.stereotype.Service;
-
-/**
- * 采购批次号 服务实现类
- *
- * @author BladeX
- * @since 2022-07-29
- */
-@Service
-public class PurchaseContractbatchServiceImpl extends ServiceImpl<PurchaseContractbatchMapper, PurchaseContractbatch> implements IPurchaseContractbatchService {
-
-    /**
-     * 添加批次
-     * @param purchaseContractbatch
-     * @return
-     */
-    @Override
-    public Boolean saveContractBatch(PurchaseContractbatch purchaseContractbatch) {
-        if(StringUtil.isEmpty(purchaseContractbatch.getPurchaseBillNo())){
-            throw new ServiceException("合同单号不能为空");
-        }
-        //生成code
-        PurchaseContractbatch sCode = getOne(Wrappers.<PurchaseContractbatch>query().lambda().
-                eq(PurchaseContractbatch::getPurchaseBillNo,purchaseContractbatch.getPurchaseBillNo()).
-                orderByDesc(PurchaseContractbatch::getBatchNo).last("limit 1"));
-        String code = purchaseContractbatch.getPurchaseBillNo()+"-001";
-        if(ObjectUtil.isEmpty(sCode)){
-            purchaseContractbatch.setBatchNo(code);
-        }else{
-            purchaseContractbatch.setBatchNo(sCode.getBatchNo()==null?code: CodeUtil.generateContractCode(sCode.getBatchNo()));
-        }
-        purchaseContractbatch.setCreate();
-        save(purchaseContractbatch);
-        return true;
-    }
-}

hx-service/storage-restructure/src/main/java/com/fjhx/house/controller/HouseController.java

@@ -1,109 +0,0 @@
-/*
- *      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.house.controller;
-
-import com.fjhx.house.entity.House;
-import com.fjhx.house.service.IHouseService;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.common.utils.ListPageMap;
-import org.springblade.core.boot.ctrl.BladeController;
-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 javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 仓库 控制器
- *
- * @author BladeX
- * @since 2022-07-21
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/house")
-public class HouseController extends BladeController {
-
-    private final IHouseService houseService;
-
-    /**
-     * 列表
-     *
-     * @param condition 查询条件
-     * @return
-     */
-    @PostMapping("/list")
-    public R getList(@RequestBody Map<String, Object> condition) {
-        ListPageMap.getListPageMap(condition);
-        List<House> list = houseService.getList(condition);
-        return R.list(list);
-    }
-
-    /**
-     * 列表-总条数
-     *
-     * @param condition 查询条件
-     * @return
-     */
-    @PostMapping("/list/count")
-    public R getListCount(@RequestBody Map<String, Object> condition) {
-        Integer count = houseService.getListCount(condition);
-        return R.count(count);
-    }
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<House> detail(House house) {
-        House detail = houseService.getOne(Condition.getQueryWrapper(house));
-        return R.data(detail);
-    }
-
-    /**
-     * 新增 仓库
-     */
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody House house) {
-        house.setCreate();
-        return R.status(houseService.save(house));
-    }
-
-    /**
-     * 修改 仓库
-     */
-    @PostMapping("/update")
-    public R update(@Valid @RequestBody House house) {
-        house.setUpdate();
-        return R.status(houseService.updateById(house));
-    }
-
-
-    /**
-     * 删除 仓库
-     */
-    @GetMapping("/remove")
-    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        return R.status(houseService.removeByIds(Func.toLongList(ids)));
-    }
-
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/house/mapper/HouseMapper.java

@@ -1,49 +0,0 @@
-/*
- *      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.house.mapper;
-
-import com.fjhx.house.entity.House;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.core.tenant.annotation.TenantIgnore;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 仓库 Mapper 接口
- *
- * @author BladeX
- * @since 2022-07-21
- */
-public interface HouseMapper extends BaseMapper<House> {
-
-    /**
-     * 列表
-     *
-     * @param condition 查询条件
-     */
-    @TenantIgnore
-    List<House> getList(Map<String, Object> condition);
-
-    /**
-     * 列表-总条数
-     *
-     * @param condition 查询条件
-     */
-    @TenantIgnore
-    Integer getListCount(Map<String, Object> condition);
-}

hx-service/storage-restructure/src/main/java/com/fjhx/house/mapper/HouseMapper.xml

@@ -1,47 +0,0 @@
-<?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.house.mapper.HouseMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="houseResultMap" type="com.fjhx.house.entity.House">
-        <id column="ID" property="id"/>
-        <result column="create_user" property="createUser"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_user" property="updateUser"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="name" property="name"/>
-        <result column="remark" property="remark"/>
-        <result column="plc_code" property="plcCode"/>
-    </resultMap>
-
-    <select id="getList" resultMap="houseResultMap">
-        SELECT
-            *
-        FROM
-            stock_house
-        <include refid="list_condition"/>
-        ORDER BY create_time DESC
-        <include refid="sql_limit"/>
-    </select>
-    <select id="getListCount" resultType="java.lang.Integer">
-        SELECT
-            count(1)
-        FROM
-            stock_house
-        <include refid="list_condition"/>
-    </select>
-    <sql id="list_condition">
-        <where>
-            is_delete = 0
-            <if test="name neq null and name neq '' ">
-                AND INSTR( `name`, #{name} ) > 0
-            </if>
-        </where>
-    </sql>
-
-    <sql id="sql_limit">
-        <if test="start != null and end != null">
-            LIMIT #{start},#{end}
-        </if>
-    </sql>
-</mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/house/service/IHouseService.java

@@ -1,46 +0,0 @@
-/*
- *      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.house.service;
-
-import com.fjhx.house.entity.House;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 仓库 服务类
- *
- * @author BladeX
- * @since 2022-07-21
- */
-public interface IHouseService extends IService<House> {
-
-    /**
-     * 列表
-     *
-     * @param condition 查询条件
-     */
-    List<House> getList(Map<String, Object> condition);
-
-    /**
-     * 列表-总条数
-     *
-     * @param condition 查询条件
-     */
-    Integer getListCount(Map<String, Object> condition);
-}

hx-service/storage-restructure/src/main/java/com/fjhx/house/service/impl/HouseServiceImpl.java

@@ -1,57 +0,0 @@
-/*
- *      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.house.service.impl;
-
-import com.fjhx.house.entity.House;
-import com.fjhx.house.mapper.HouseMapper;
-import com.fjhx.house.service.IHouseService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 仓库 服务实现类
- *
- * @author BladeX
- * @since 2022-07-21
- */
-@Service
-public class HouseServiceImpl extends ServiceImpl<HouseMapper, House> implements IHouseService {
-
-
-    /**
-     * 列表
-     * @param condition 查询条件
-     * @return
-     */
-    @Override
-    public List<House> getList(Map<String, Object> condition) {
-        return baseMapper.getList(condition);
-    }
-
-    /**
-     * 列表条数
-     * @param condition 查询条件
-     * @return
-     */
-    @Override
-    public Integer getListCount(Map<String, Object> condition) {
-        return baseMapper.getListCount(condition);
-    }
-}

hx-service/storage-restructure/src/main/java/com/fjhx/material/controller/MaterialCategoryController.java

@@ -1,93 +0,0 @@
-/*
- *      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.material.controller;
-
-import com.fjhx.base.TreeNode;
-import com.fjhx.material.entity.MaterialCategory;
-import com.fjhx.material.service.IMaterialCategoryService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
-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 javax.validation.Valid;
-import java.util.List;
-
-/**
- * 物料分类 控制器
- *
- * @author BladeX
- * @since 2022-07-21
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/materialcategory")
-@Api(value = "物料分类", tags = "物料分类接口")
-public class MaterialCategoryController extends BladeController {
-
-    private final IMaterialCategoryService materialCategoryService;
-
-    /**
-     * 树列表
-     */
-    @GetMapping("/treeList")
-    public R treeList() {
-        List<TreeNode> list = materialCategoryService.getTreeList();
-        return R.list(list);
-    }
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<MaterialCategory> detail(MaterialCategory materialCategory) {
-        MaterialCategory detail = materialCategoryService.getOne(Condition.getQueryWrapper(materialCategory));
-        return R.data(detail);
-    }
-
-    /**
-     * 新增 物料分类
-     */
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody MaterialCategory materialCategory) {
-        materialCategory.setCreate();
-        return R.status(materialCategoryService.save(materialCategory));
-    }
-
-    /**
-     * 修改 物料分类
-     */
-    @PostMapping("/update")
-    public R update(@Valid @RequestBody MaterialCategory materialCategory) {
-        materialCategory.setUpdate();
-        return R.status(materialCategoryService.updateById(materialCategory));
-    }
-
-    /**
-     * 删除 物料分类
-     */
-    @GetMapping("/remove")
-    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        return R.status(materialCategoryService.removeByIds(Func.toLongList(ids)));
-    }
-
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/material/controller/MaterialController.java

@@ -1,135 +0,0 @@
-/*
- *      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.material.controller;
-
-import com.fjhx.material.entity.Material;
-import com.fjhx.material.service.IMaterialService;
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import org.springblade.common.utils.ListPageMap;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 物料 控制器
- *
- * @author BladeX
- * @since 2022-07-21
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/material")
-@Api(value = "物料", tags = "物料接口")
-public class MaterialController extends BladeController {
-
-    private final IMaterialService materialService;
-
-    /**
-     * 列表
-     *
-     * @param condition 查询条件
-     * @return
-     */
-    @PostMapping("/list")
-    public R getList(@RequestBody Map<String, Object> condition) {
-        ListPageMap.getListPageMap(condition);
-        List<Material> list = materialService.getList(condition);
-        return R.list(list);
-    }
-
-    /**
-     * 列表-总条数
-     *
-     * @param condition 查询条件
-     * @return
-     */
-    @PostMapping("/list/count")
-    public R getListCount(@RequestBody Map<String, Object> condition) {
-        Integer count = materialService.getListCount(condition);
-        return R.count(count);
-    }
-
-
-    /**
-     * 主营价格列表
-     *
-     * @param condition 查询条件
-     * @return
-     */
-    @PostMapping("/price/list")
-    public R getPriceList(@RequestBody Map<String, Object> condition) {
-        ListPageMap.getListPageMap(condition);
-        List<Material> list = materialService.getPriceList(condition);
-        return R.list(list);
-    }
-
-    /**
-     * 主营价格列表-总条数
-     *
-     * @param condition 查询条件
-     * @return
-     */
-    @PostMapping("/price/list/count")
-    public R getPriceListCount(@RequestBody Map<String, Object> condition) {
-        Integer count = materialService.getPriceListCount(condition);
-        return R.count(count);
-    }
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<Material> detail(Material material) {
-        Material detail = materialService.getOne(Condition.getQueryWrapper(material));
-        return R.data(detail);
-    }
-
-    /**
-     * 新增 物料
-     */
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody Material material) {
-        materialService.addMaterial(material);
-        return R.success();
-    }
-
-    /**
-     * 修改 物料
-     */
-    @PostMapping("/update")
-    public R update(@Valid @RequestBody Material material) {
-        materialService.editMaterial(material);
-        return R.success();
-    }
-
-    /**
-     * 删除 物料
-     */
-    @GetMapping("/remove")
-    public R remove(@RequestParam("id") String id) {
-        materialService.delMaterial(id);
-        return R.success();
-    }
-
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/material/controller/MaterialExtendController.java

@@ -1,40 +0,0 @@
-/*
- *      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.material.controller;
-
-import com.fjhx.material.service.IMaterialExtendService;
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 物料扩展 控制器
- *
- * @author BladeX
- * @since 2022-07-21
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/materialextend")
-@Api(value = "物料扩展", tags = "物料接口")
-public class MaterialExtendController extends BladeController {
-
-    private final IMaterialExtendService materialExtendService;
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/material/mapper/MaterialCategoryMapper.java

@@ -1,30 +0,0 @@
-/*
- *      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.material.mapper;
-
-import com.fjhx.material.entity.MaterialCategory;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 物料分类 Mapper 接口
- *
- * @author BladeX
- * @since 2022-07-21
- */
-public interface MaterialCategoryMapper extends BaseMapper<MaterialCategory> {
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/material/mapper/MaterialCategoryMapper.xml

@@ -1,20 +0,0 @@
-<?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.material.mapper.MaterialCategoryMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="materialCategoryResultMap" type="com.fjhx.material.entity.MaterialCategory">
-        <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="name" property="name"/>
-        <result column="parent_id" property="parentId"/>
-        <result column="is_for_chose" property="isForChose"/>
-        <result column="warehouse" property="warehouse"/>
-    </resultMap>
-
-</mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/material/mapper/MaterialExtendMapper.java

@@ -1,30 +0,0 @@
-/*
- *      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.material.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fjhx.material.entity.MaterialExtend;
-
-/**
- * 物料扩展 Mapper 接口
- *
- * @author BladeX
- * @since 2022-07-21
- */
-public interface MaterialExtendMapper extends BaseMapper<MaterialExtend> {
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/material/mapper/MaterialExtendMapper.xml

@@ -1,13 +0,0 @@
-<?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.material.mapper.MaterialExtendMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="materialExtendResultMap" type="com.fjhx.material.entity.MaterialExtend">
-        <id column="id" property="id"/>
-        <result column="material_id" property="materialId"/>
-        <result column="unit_weight" property="unitWeight"/>
-        <result column="width" property="width"/>
-    </resultMap>
-
-</mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/material/mapper/MaterialMapper.java

@@ -1,69 +0,0 @@
-/*
- *      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.material.mapper;
-
-import com.fjhx.material.entity.Material;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.core.tenant.annotation.TenantIgnore;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 物料 Mapper 接口
- *
- * @author BladeX
- * @since 2022-07-21
- */
-public interface MaterialMapper extends BaseMapper<Material> {
-
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    @TenantIgnore
-    List<Material> getList(Map<String, Object> condition);
-
-    /**
-     * 列表-总条数
-     *
-     * @param condition
-     * @return
-     */
-    @TenantIgnore
-    Integer getListCount(Map<String, Object> condition);
-
-    /**
-     * 主营价格-列表
-     *
-     * @param condition
-     * @return
-     */
-    @TenantIgnore
-    List<Material> getPriceList(Map<String, Object> condition);
-
-    /**
-     * 主营价格列表-总条数
-     *
-     * @param condition
-     * @return
-     */
-    @TenantIgnore
-    Integer getPriceListCount(Map<String, Object> condition);
-}

hx-service/storage-restructure/src/main/java/com/fjhx/material/mapper/MaterialMapper.xml

@@ -1,98 +0,0 @@
-<?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.material.mapper.MaterialMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="materialResultMap" type="com.fjhx.material.entity.Material">
-        <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="name" property="name"/>
-        <result column="code" property="code"/>
-        <result column="unit_weight" property="unitWeight"/>
-        <result column="width" property="width"/>
-        <result column="category_id" property="categoryId"/>
-        <result column="safety_stock" property="safetyStock"/>
-        <result column="check_rate" property="checkRate"/>
-        <result column="safety_warn_day" property="safetyWarnDay"/>
-        <result column="spec" property="spec"/>
-        <result column="remark" property="remark"/>
-        <result column="price" property="price"/>
-        <result column="stock_standard" property="stockStandard"/>
-        <result column="purpose" property="purpose"/>
-        <result column="technology_type" property="technologyType"/>
-
-        <result column="unit_weight" property="unitWeight"/>
-        <result column="width" property="width"/>
-        <result column="purchasePrice" property="purchasePrice"/>
-
-    </resultMap>
-
-    <select id="getList" resultMap="materialResultMap">
-        SELECT
-            t1.*,
-            t3.`unit_weight`,
-            t3.width
-        FROM
-            stock_material t1
-        LEFT JOIN stock_material_category t2 ON t1.category_id = t2.id
-        LEFT JOIN stock_material_extend t3 ON t1.id = t3.material_id
-        <include refid="list_condition"/>
-        ORDER BY create_time DESC
-        <include refid="com.fjhx.house.mapper.HouseMapper.sql_limit"/>
-    </select>
-    <select id="getListCount" resultType="java.lang.Integer">
-        SELECT
-            count(1)
-        FROM
-            stock_material t1
-        LEFT JOIN stock_material_category t2 ON t1.category_id = t2.id
-        LEFT JOIN stock_material_extend t3 ON t1.id = t3.material_id
-        <include refid="list_condition"/>
-    </select>
-    <select id="getPriceList" resultMap="materialResultMap">
-        SELECT
-            t1.price AS purchasePrice,
-            t2.*
-        FROM
-            stock_supplier_price t1
-        LEFT JOIN stock_material t2 ON t1.material_id = t2.id
-        <include refid="price_list_condition"/>
-        ORDER BY create_time DESC
-        <include refid="com.fjhx.house.mapper.HouseMapper.sql_limit"/>
-    </select>
-    <select id="getPriceListCount" resultType="java.lang.Integer">
-        SELECT
-            count(1)
-        FROM
-        stock_supplier_price t1
-        LEFT JOIN stock_material t2 ON t1.material_id = t2.id
-        <include refid="price_list_condition"/>
-    </select>
-    <sql id="price_list_condition">
-        <where>
-            t1.is_delete = 0
-            AND t1.supplier_id = #{supplierId}
-            <if test="search neq null and search neq '' ">
-                AND ((INSTR(t2.`name`, #{search}) > 0) OR (INSTR(t2.`code`, #{search}) > 0) )
-            </if>
-        </where>
-    </sql>
-    <sql id="list_condition">
-        <where>
-            t1.is_delete = 0
-            <if test="search neq null and search neq '' ">
-                AND ((INSTR(t1.`name`, #{search}) > 0) OR (INSTR(t1.`code`, #{search}) > 0) )
-            </if>
-            <if test="categoryId neq null and categoryId neq '' ">
-                AND (
-                t1.category_id = #{categoryId}
-                OR FIND_IN_SET( #{categoryId}, t2.ancestors )
-                )
-            </if>
-        </where>
-    </sql>
-</mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/material/service/IMaterialCategoryService.java

@@ -1,39 +0,0 @@
-/*
- *      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.material.service;
-
-import com.fjhx.base.TreeNode;
-import com.fjhx.material.entity.MaterialCategory;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-import java.util.List;
-
-/**
- * 物料分类 服务类
- *
- * @author BladeX
- * @since 2022-07-21
- */
-public interface IMaterialCategoryService extends IService<MaterialCategory> {
-
-    /**
-     * 获取分类树
-     * @return
-     */
-    List<TreeNode> getTreeList ();
-}

hx-service/storage-restructure/src/main/java/com/fjhx/material/service/IMaterialExtendService.java

@@ -1,30 +0,0 @@
-/*
- *      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.material.service;
-
-import com.fjhx.material.entity.MaterialExtend;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 物料扩展 服务类
- *
- * @author BladeX
- * @since 2022-07-21
- */
-public interface IMaterialExtendService extends IService<MaterialExtend> {
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/material/service/IMaterialService.java

@@ -1,82 +0,0 @@
-/*
- *      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.material.service;
-
-import com.fjhx.material.entity.Material;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 物料 服务类
- *
- * @author BladeX
- * @since 2022-07-21
- */
-public interface IMaterialService extends IService<Material> {
-
-    /**
-     * 添加
-     * @param material
-     */
-    void addMaterial(Material material);
-
-    /**
-     * 修改
-     * @param material
-     */
-    void editMaterial(Material material);
-
-    /**
-     * 删除
-     * @param id
-     */
-    void delMaterial(String id);
-
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    List<Material> getList(Map<String, Object> condition);
-
-    /**
-     * 列表-总条数
-     *
-     * @param condition
-     * @return
-     */
-    Integer getListCount(Map<String, Object> condition);
-
-    /**
-     * 主营价格列表
-     *
-     * @param condition
-     * @return
-     */
-    List<Material> getPriceList(Map<String, Object> condition);
-
-    /**
-     * 主营价格列表-总条数
-     *
-     * @param condition
-     * @return
-     */
-    Integer getPriceListCount(Map<String, Object> condition);
-}

hx-service/storage-restructure/src/main/java/com/fjhx/material/service/impl/MaterialCategoryServiceImpl.java

@@ -1,57 +0,0 @@
-/*
- *      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.material.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fjhx.base.TreeNode;
-import com.fjhx.material.entity.MaterialCategory;
-import com.fjhx.material.mapper.MaterialCategoryMapper;
-import com.fjhx.material.service.IMaterialCategoryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 物料分类 服务实现类
- *
- * @author BladeX
- * @since 2022-07-21
- */
-@Service
-public class MaterialCategoryServiceImpl extends ServiceImpl<MaterialCategoryMapper, MaterialCategory> implements IMaterialCategoryService {
-
-    /**
-     * 树列表
-     * @return
-     */
-    @Override
-    public List<TreeNode> getTreeList() {
-        List<MaterialCategory> list = baseMapper.selectList(Wrappers.<MaterialCategory>query().lambda().
-                eq(MaterialCategory::getIsDelete,0).orderByDesc(MaterialCategory::getCreateTime));
-        List<TreeNode> treeNodes = new ArrayList<>();
-        if (ObjectUtil.isNotEmpty(list)) {
-            for (MaterialCategory m : list) {
-                TreeNode treeNode = new TreeNode(m.getId(), m.getName(), m.getParentId(), m.getAncestors());
-                treeNodes.add(treeNode);
-            }
-        }
-        return treeNodes;
-    }
-}

hx-service/storage-restructure/src/main/java/com/fjhx/material/service/impl/MaterialExtendServiceImpl.java

@@ -1,35 +0,0 @@
-/*
- *      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.material.service.impl;
-
-import com.fjhx.material.entity.MaterialExtend;
-import com.fjhx.material.mapper.MaterialExtendMapper;
-import com.fjhx.material.service.IMaterialExtendService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * 物料 服务实现类
- *
- * @author BladeX
- * @since 2022-07-21
- */
-@Service
-public class MaterialExtendServiceImpl extends ServiceImpl<MaterialExtendMapper, MaterialExtend> implements IMaterialExtendService {
-
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/material/service/impl/MaterialServiceImpl.java

@@ -1,151 +0,0 @@
-/*
- *      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.material.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.material.entity.Material;
-import com.fjhx.material.entity.MaterialExtend;
-import com.fjhx.material.mapper.MaterialMapper;
-import com.fjhx.material.service.IMaterialExtendService;
-import com.fjhx.material.service.IMaterialService;
-import org.springblade.core.log.exception.ServiceException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 物料 服务实现类
- *
- * @author BladeX
- * @since 2022-07-21
- */
-@Service
-public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> implements IMaterialService {
-
-
-    @Autowired
-    private IMaterialExtendService materialExtendService;
-
-    /**
-     * 新增接口
-     *
-     * @param material
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void addMaterial(Material material) {
-        if (!ObjectUtil.isAllNotEmpty(material.getCategoryId(), material.getCode(), material.getName())) {
-            throw new ServiceException("参数异常");
-        }
-        material.setCreate();
-        save(material);
-
-        if (ObjectUtil.isNotEmpty(material.getWidth()) || ObjectUtil.isNotEmpty(material.getUnitWeight())) {
-            //添加扩展表
-            MaterialExtend extend = new MaterialExtend();
-            extend.setUnitWeight(material.getUnitWeight());
-            extend.setWidth(material.getWidth());
-            extend.setMaterialId(material.getId());
-            materialExtendService.save(extend);
-        }
-
-    }
-
-    /**
-     * 修改
-     *
-     * @param material
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void editMaterial(Material material) {
-        if (cn.hutool.core.util.ObjectUtil.isEmpty(material.getId())) {
-            throw new ServiceException("参数异常");
-        }
-        //扩展表不能修改
-//        if(ObjectUtil.isNotEmpty(material.getWidth())||
-//                ObjectUtil.isNotEmpty(material.getUnitWeight())){
-//            //修改数据
-//            MaterialExtend extend = new MaterialExtend();
-//            extend.setUnitWeight(material.getUnitWeight());
-//            extend.setWidth(material.getWidth());
-//            materialExtendService.update(extend,Wrappers.<MaterialExtend>query().lambda().eq(MaterialExtend::getMaterialId,material.getId()));
-//        }
-        material.setUpdate();
-        updateById(material);
-    }
-
-    /**
-     * 删除
-     *
-     * @param id
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delMaterial(String id) {
-        removeById(id);
-//        materialExtendService.remove(Wrappers.<MaterialExtend>query().lambda().eq(MaterialExtend::getMaterialId,id));
-    }
-
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    @Override
-    public List<Material> getList(Map<String, Object> condition) {
-        return baseMapper.getList(condition);
-    }
-
-    /**
-     * 列表条数
-     *
-     * @param condition
-     * @return
-     */
-    @Override
-    public Integer getListCount(Map<String, Object> condition) {
-        return baseMapper.getListCount(condition);
-    }
-
-    /**
-     * 主营价格列表
-     *
-     * @param condition
-     * @return
-     */
-    @Override
-    public List<Material> getPriceList(Map<String, Object> condition) {
-        return baseMapper.getPriceList(condition);
-    }
-
-    /**
-     * 主营价格列表条数
-     *
-     * @param condition
-     * @return
-     */
-    @Override
-    public Integer getPriceListCount(Map<String, Object> condition) {
-        return baseMapper.getPriceListCount(condition);
-    }
-}

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/controller/ApplyPurchaseController.java

@@ -1,89 +0,0 @@
-/*
- *      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.subscribe.controller;
-
-import com.fjhx.subscribe.entity.ApplyPurchase;
-import com.fjhx.subscribe.service.IApplyPurchaseService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.common.utils.ListPageMap;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 申购单 控制器
- *
- * @author BladeX
- * @since 2022-07-26
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/applypurchase")
-@Api(value = "申购单", tags = "申购单接口")
-public class ApplyPurchaseController extends BladeController {
-
-    private final IApplyPurchaseService applyPurchaseService;
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<ApplyPurchase> detail(@RequestParam("id") String id) {
-        ApplyPurchase detail = applyPurchaseService.detailApplyPurchase(id);
-        return R.data(detail);
-    }
-
-    /**
-     * 删除 申购单
-     */
-    @PostMapping("/remove")
-    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        return R.status(applyPurchaseService.removeByIds(Func.toLongList(ids)));
-    }
-
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping("/list")
-    public R list(@RequestBody Map<String, Object> condition) {
-        ListPageMap.getListPageMap(condition);
-        List<ApplyPurchase> result = applyPurchaseService.getList(condition);
-        return R.success(result);
-    }
-
-    /**
-     * 列表条数
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping("/list/count")
-    public R listCount(@RequestBody Map<String, Object> condition) {
-        ListPageMap.getListPageMap(condition);
-        Integer count = applyPurchaseService.getListCount(condition);
-        return R.success(count);
-    }
-}

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/controller/ApplyPurchaseFlowController.java

@@ -1,81 +0,0 @@
-/*
- *      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.subscribe.controller;
-
-import com.fjhx.myapp.application.entity.FlowParam;
-import com.fjhx.subscribe.entity.ApplyPurchase;
-import com.fjhx.subscribe.service.IApplyPurchaseFlowService;
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.api.R;
-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;
-
-/**
- * 申购单流程 控制器
- *
- * @author BladeX
- * @since 2022-07-26
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/applypurchase/flow")
-@Api(value = "申购单流程", tags = "申购单接口")
-public class ApplyPurchaseFlowController extends BladeController {
-
-    private final IApplyPurchaseFlowService flowService;
-
-
-    /**
-     * 开始流程
-     *
-     * @param applyPurchase
-     * @return
-     */
-    @PostMapping(value = "/start")
-    public R start(@RequestBody ApplyPurchase applyPurchase) {
-        flowService.start(applyPurchase);
-        return R.success();
-    }
-
-    /**
-     * 审核
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping(value = "/examine")
-    public R examine(@RequestBody FlowParam condition) {
-        flowService.examine(condition);
-        return R.success();
-    }
-
-    /**
-     * 回退
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping(value = "/reject")
-    public R reject(@RequestBody FlowParam condition) {
-        flowService.reject(condition);
-        return R.success();
-    }
-}

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/controller/ApplyPurchasedetailController.java

@@ -1,90 +0,0 @@
-/*
- *      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.subscribe.controller;
-
-import com.fjhx.subscribe.entity.ApplyPurchasedetail;
-import com.fjhx.subscribe.service.IApplyPurchasedetailService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.common.utils.ListPageMap;
-import org.springblade.core.boot.ctrl.BladeController;
-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 java.util.List;
-import java.util.Map;
-
-/**
- * 申购单明细 控制器
- *
- * @author BladeX
- * @since 2022-07-26
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/applypurchasedetail")
-@Api(value = "申购单明细", tags = "申购单明细接口")
-public class ApplyPurchasedetailController extends BladeController {
-
-    private final IApplyPurchasedetailService applyPurchasedetailService;
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<ApplyPurchasedetail> detail(ApplyPurchasedetail applyPurchasedetail) {
-        ApplyPurchasedetail detail = applyPurchasedetailService.getOne(Condition.getQueryWrapper(applyPurchasedetail));
-        return R.data(detail);
-    }
-
-    /**
-     * 删除 申购单明细
-     */
-    @PostMapping("/remove")
-    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        return R.status(applyPurchasedetailService.removeByIds(Func.toLongList(ids)));
-    }
-
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping("/list")
-    public R list(@RequestBody Map<String, Object> condition) {
-        ListPageMap.getListPageMap(condition);
-        List<ApplyPurchasedetail> result = applyPurchasedetailService.getList(condition);
-        return R.success(result);
-    }
-
-    /**
-     * 列表条数
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping("/list/count")
-    public R listCount(@RequestBody Map<String, Object> condition) {
-        ListPageMap.getListPageMap(condition);
-        Integer count = applyPurchasedetailService.getListCount(condition);
-        return R.success(count);
-    }
-}

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/mapper/ApplyPurchaseMapper.java

@@ -1,53 +0,0 @@
-/*
- *      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.subscribe.mapper;
-
-import com.fjhx.subscribe.entity.ApplyPurchase;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.fjhx.supplier.entity.Supplier;
-import org.springblade.core.tenant.annotation.TenantIgnore;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 申购单 Mapper 接口
- *
- * @author BladeX
- * @since 2022-07-26
- */
-public interface ApplyPurchaseMapper extends BaseMapper<ApplyPurchase> {
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    @TenantIgnore
-    List<ApplyPurchase> getList(Map<String, Object> condition);
-
-    /**
-     * 列表-总条数
-     *
-     * @param condition
-     * @return
-     */
-    @TenantIgnore
-    Integer getListCount(Map<String, Object> condition);
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/mapper/ApplyPurchaseMapper.xml

@@ -1,54 +0,0 @@
-<?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.subscribe.mapper.ApplyPurchaseMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="applyPurchaseResultMap" type="com.fjhx.subscribe.entity.ApplyPurchase">
-        <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="apply_bill_no" property="applyBillNo"/>
-        <result column="depart_name" property="departName"/>
-        <result column="apply_time" property="applyTime"/>
-        <result column="apply_account" property="applyAccount"/>
-        <result column="apply_pur_type" property="applyPurType"/>
-        <result column="purchase_content" property="purchaseContent"/>
-        <result column="approve_bill_state" property="approveBillState"/>
-        <result column="approval_time" property="approvalTime"/>
-        <result column="safety_stock_create" property="safetyStockCreate"/>
-    </resultMap>
-
-    <select id="getList" resultMap="applyPurchaseResultMap">
-        SELECT
-            t1.*,
-            t2.`name` AS userName
-        FROM
-            stock_apply_purchase t1
-        LEFT JOIN blade_user t2 ON t1.create_user = t2.id
-        <include refid="list_condition"/>
-        ORDER BY t1.create_time DESC
-        <include refid="com.fjhx.house.mapper.HouseMapper.sql_limit"/>
-    </select>
-    <select id="getListCount" resultType="java.lang.Integer">
-        SELECT
-            count(1)
-        FROM
-            stock_apply_purchase t1
-        LEFT JOIN blade_user t2 ON t1.create_user = t2.id
-        <include refid="list_condition"/>
-    </select>
-    <sql id="list_condition">
-        <where>
-            t1.is_delete = 0
-            <if test="search neq null and search neq '' ">
-                AND ((INSTR(t1.apply_bill_no, #{search}) > 0) OR (INSTR(t2.`name`, #{search}) > 0) )
-            </if>
-            <if test="approveBillState neq null and approveBillState neq '' ">
-                AND t1.approve_bill_state = #{approveBillState}
-            </if>
-        </where>
-    </sql>
-</mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/mapper/ApplyPurchasedetailMapper.java

@@ -1,53 +0,0 @@
-/*
- *      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.subscribe.mapper;
-
-import com.fjhx.subscribe.entity.ApplyPurchase;
-import com.fjhx.subscribe.entity.ApplyPurchasedetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.tenant.annotation.TenantIgnore;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 申购单明细 Mapper 接口
- *
- * @author BladeX
- * @since 2022-07-26
- */
-public interface ApplyPurchasedetailMapper extends BaseMapper<ApplyPurchasedetail> {
-
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    @TenantIgnore
-    List<ApplyPurchasedetail> getList(Map<String, Object> condition);
-
-    /**
-     * 列表-总条数
-     *
-     * @param condition
-     * @return
-     */
-    @TenantIgnore
-    Integer getListCount(Map<String, Object> condition);
-}

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/mapper/ApplyPurchasedetailMapper.xml

@@ -1,34 +0,0 @@
-<?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.subscribe.mapper.ApplyPurchasedetailMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="applyPurchasedetailResultMap" type="com.fjhx.subscribe.entity.ApplyPurchasedetail">
-        <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="apply_purchase_id" property="applyPurchaseId"/>
-        <result column="material_id" property="materialId"/>
-        <result column="purchase_qty" property="purchaseQty"/>
-        <result column="purpose" property="purpose"/>
-    </resultMap>
-
-    <select id="getList" resultMap="applyPurchasedetailResultMap">
-        SELECT
-            *
-        FROM
-            stock_apply_purchasedetail
-        ORDER BY create_time DESC
-        <include refid="com.fjhx.house.mapper.HouseMapper.sql_limit"/>
-    </select>
-    <select id="getListCount" resultType="java.lang.Integer">
-        SELECT
-            count(1)
-        FROM
-            stock_apply_purchasedetail
-        ORDER BY create_time DESC
-    </select>
-</mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/service/IApplyPurchaseFlowService.java

@@ -1,51 +0,0 @@
-/*
- *      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.subscribe.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.myapp.application.entity.FlowParam;
-import com.fjhx.subscribe.entity.ApplyPurchase;
-
-/**
- * 申购单流程 服务类
- *
- * @author BladeX
- * @since 2022-07-26
- */
-public interface IApplyPurchaseFlowService extends IService<ApplyPurchase> {
-
-    /**
-     * 开始流程
-     *
-     * @param applyPurchase
-     */
-    void start(ApplyPurchase applyPurchase);
-
-    /**
-     * 审核
-     *
-     * @param condition
-     */
-    void examine(FlowParam condition);
-
-    /**
-     * 驳回
-     *
-     * @param condition
-     */
-    void reject(FlowParam condition);
-}

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/service/IApplyPurchaseService.java

@@ -1,56 +0,0 @@
-/*
- *      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.subscribe.service;
-
-import com.fjhx.subscribe.entity.ApplyPurchase;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.fjhx.supplier.entity.Supplier;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 申购单 服务类
- *
- * @author BladeX
- * @since 2022-07-26
- */
-public interface IApplyPurchaseService extends IService<ApplyPurchase> {
-
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    List<ApplyPurchase> getList(Map<String, Object> condition);
-
-    /**
-     * 列表-总条数
-     *
-     * @param condition
-     * @return
-     */
-    Integer getListCount(Map<String, Object> condition);
-
-    /**
-     * 明细
-     * @return
-     */
-    ApplyPurchase detailApplyPurchase(String id);
-}

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/service/IApplyPurchasedetailService.java

@@ -1,50 +0,0 @@
-/*
- *      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.subscribe.service;
-
-import com.fjhx.subscribe.entity.ApplyPurchase;
-import com.fjhx.subscribe.entity.ApplyPurchasedetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 申购单明细 服务类
- *
- * @author BladeX
- * @since 2022-07-26
- */
-public interface IApplyPurchasedetailService extends IService<ApplyPurchasedetail> {
-
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    List<ApplyPurchasedetail> getList(Map<String, Object> condition);
-
-    /**
-     * 列表-总条数
-     *
-     * @param condition
-     * @return
-     */
-    Integer getListCount(Map<String, Object> condition);
-}

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/service/impl/ApplyPurchaseFlowServiceImpl.java

@@ -1,229 +0,0 @@
-/*
- *      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.subscribe.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.contract.entity.PurchaseContract;
-import com.fjhx.contract.entity.PurchaseContractMaterial;
-import com.fjhx.contract.service.IPurchaseContractService;
-import com.fjhx.myapp.application.entity.FlowParam;
-import com.fjhx.myapp.application.enums.FlowTypeEnum;
-import com.fjhx.myapp.application.feign.IFlowApi;
-import com.fjhx.subscribe.entity.ApplyPurchase;
-import com.fjhx.subscribe.entity.ApplyPurchasedetail;
-import com.fjhx.subscribe.enums.ApplyPurchaseStatusEnum;
-import com.fjhx.subscribe.mapper.ApplyPurchaseMapper;
-import com.fjhx.subscribe.service.IApplyPurchaseFlowService;
-import com.fjhx.subscribe.service.IApplyPurchasedetailService;
-import org.springblade.common.utils.CodeUtil;
-import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.system.user.entity.User;
-import org.springblade.system.user.feign.IUserClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 申购单流程 服务实现类
- *
- * @author BladeX
- * @since 2022-07-26
- */
-@Service
-public class ApplyPurchaseFlowServiceImpl extends ServiceImpl<ApplyPurchaseMapper, ApplyPurchase> implements IApplyPurchaseFlowService {
-
-    @Autowired
-    private IFlowApi flowApi;
-    @Autowired
-    private IUserClient userClient;
-    @Autowired
-    private IApplyPurchasedetailService iApplyPurchasedetailService;
-    @Autowired
-    private IPurchaseContractService iPurchaseContractService;
-
-    /**
-     * 发起流程
-     *
-     * @param applyPurchase
-     */
-    @Override
-    public void start(ApplyPurchase applyPurchase) {
-        //状态=审批中
-        applyPurchase.setApproveBillState(ApplyPurchaseStatusEnum.APPLY_PURCHASE_STATUS_1.getKey());
-        User user = userClient.infoUser(AuthUtil.getUserIdStr());
-        if (ObjectUtil.isEmpty(applyPurchase.getApplyBillNo())) {
-            //生成code
-            ApplyPurchase sCode = getOne(Wrappers.<ApplyPurchase>query().lambda().orderByDesc(ApplyPurchase::getApplyBillNo).last("limit 1"));
-            String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
-            String code = "PR-" + date + "-0001";
-            if (ObjectUtil.isEmpty(sCode)) {
-                applyPurchase.setApplyBillNo(code);
-            } else {
-                applyPurchase.setApplyBillNo(sCode.getApplyBillNo() == null ? code : CodeUtil.generateSubscribeCode(sCode.getApplyBillNo()));
-            }
-        }
-        //发起审批
-        String title = "caozj" + " 在" + LocalDate.now() + "日发起了 申购单审批流程（单号" + applyPurchase.getApplyBillNo() + "）";
-        if (ObjectUtil.isEmpty(applyPurchase.getId())) {
-            saveApplyPurchase(applyPurchase);
-        } else {
-            updateApplyPurchase(applyPurchase);
-        }
-        //发起流程
-        FlowParam param = setValue(title, null, applyPurchase.getId(), FlowTypeEnum.type_1.getValue(), null);
-        try {
-            flowApi.startFlow(param);
-        } catch (Exception e) {
-            throw new ServiceException("流程异常");
-        }
-    }
-
-    /**
-     * 审批
-     *
-     * @param condition
-     */
-    @Override
-    public void examine(FlowParam condition) {
-        if (!ObjectUtil.isAllNotEmpty(condition.getBusinessId(), condition.getProInstantsId())) {
-            throw new ServiceException("参数缺失");
-        }
-        //查询申购单信息
-        ApplyPurchase applyPurchase = this.getById(condition.getBusinessId());
-        if (applyPurchase == null) {
-            throw new ServiceException("申购单不存在");
-        }
-        //查询申购明细
-        List<ApplyPurchasedetail> purchasedetailList = iApplyPurchasedetailService.list(Wrappers.<ApplyPurchasedetail>query().lambda().
-                eq(ApplyPurchasedetail::getApplyPurchaseId, applyPurchase.getId()));
-        try {
-            Boolean flowResult = flowApi.examineFlow(condition);
-            if (flowResult) {//流程结束
-                ApplyPurchase update = new ApplyPurchase();
-                update.setId(condition.getBusinessId());
-                update.setApprovalTime(new Date());
-                update.setApproveBillState(ApplyPurchaseStatusEnum.APPLY_PURCHASE_STATUS_2.getKey());
-                this.updateById(update);
-                //生成合同
-                PurchaseContract contract = new PurchaseContract();
-                List<PurchaseContractMaterial> materialList = new ArrayList<>();
-                PurchaseContractMaterial material = new PurchaseContractMaterial();
-                for (ApplyPurchasedetail d : purchasedetailList) {
-                    material.setMaterialId(d.getMaterialId());
-                    material.setPurchaseQty(d.getPurchaseQty());
-                    materialList.add(material);
-                    contract.setApplyPurchaseId(condition.getBusinessId());
-                    contract.setMaterialList(materialList);
-                    iPurchaseContractService.savePurchaseContract(contract);
-                }
-            }
-        } catch (Exception e) {
-            throw new ServiceException("流程异常");
-        }
-    }
-
-    /**
-     * 驳回
-     *
-     * @param condition
-     */
-    @Override
-    public void reject(FlowParam condition) {
-        if (!ObjectUtil.isAllNotEmpty(condition.getBusinessId(), condition.getProInstantsId())) {
-            throw new ServiceException("参数缺失");
-        }
-        try {
-            Boolean flowResult = flowApi.rejectFlow(condition);//驳回完后判断流程是否结束。还是转交到上一个节点
-            if (flowResult) {//流程结束
-                ApplyPurchase update = new ApplyPurchase();
-                update.setId(condition.getBusinessId());
-                update.setApproveBillState(ApplyPurchaseStatusEnum.APPLY_PURCHASE_STATUS_3.getKey());
-                this.updateById(update);
-            }
-        } catch (Exception e) {
-            throw new ServiceException("流程异常");
-        }
-    }
-
-    /**
-     * 设置流程属性
-     *
-     * @param title
-     * @param common
-     * @param businessId
-     * @param flowIdentifying
-     * @param proInstantsId
-     * @return
-     */
-    private FlowParam setValue(String title, String common, String businessId, String flowIdentifying, String proInstantsId) {
-        FlowParam param = new FlowParam();
-        param.setCommon(common);
-        param.setBusinessId(businessId);
-        param.setFlowIdentifying(flowIdentifying);
-        param.setTitle(title);
-        return param;
-    }
-
-    /**
-     * 新增
-     *
-     * @param applyPurchase
-     */
-    private void saveApplyPurchase(ApplyPurchase applyPurchase) {
-        applyPurchase.setCreate();
-        save(applyPurchase);
-        //申购明细保存
-        List<ApplyPurchasedetail> applyPurchasedetailList = applyPurchase.getPurchasedetailList();
-        if (ObjectUtil.isNotEmpty(applyPurchasedetailList)) {
-            for (ApplyPurchasedetail d : applyPurchasedetailList) {
-                d.setCreate();
-                d.setApplyPurchaseId(applyPurchase.getId());
-            }
-            iApplyPurchasedetailService.saveBatch(applyPurchasedetailList);
-        }
-    }
-
-    /**
-     * 修改
-     *
-     * @param applyPurchase
-     */
-    private void updateApplyPurchase(ApplyPurchase applyPurchase) {
-        applyPurchase.setUpdate();
-        updateById(applyPurchase);
-        //申购明细修改
-        List<ApplyPurchasedetail> applyPurchasedetailList = applyPurchase.getPurchasedetailList();
-        if (ObjectUtil.isNotEmpty(applyPurchasedetailList)) {
-            //清空申购明细
-            iApplyPurchasedetailService.remove(Wrappers.<ApplyPurchasedetail>query().lambda().eq(ApplyPurchasedetail::getApplyPurchaseId, applyPurchase.getId()));
-            for (ApplyPurchasedetail d : applyPurchasedetailList) {
-                d.setCreate();
-                d.setApplyPurchaseId(applyPurchase.getId());
-            }
-            iApplyPurchasedetailService.saveBatch(applyPurchasedetailList);
-        }
-
-    }
-}

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/service/impl/ApplyPurchaseServiceImpl.java

@@ -1,96 +0,0 @@
-/*
- *      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.subscribe.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.subscribe.entity.ApplyPurchase;
-import com.fjhx.subscribe.entity.ApplyPurchasedetail;
-import com.fjhx.subscribe.mapper.ApplyPurchaseMapper;
-import com.fjhx.subscribe.service.IApplyPurchaseService;
-import com.fjhx.subscribe.service.IApplyPurchasedetailService;
-import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.system.user.entity.User;
-import org.springblade.system.user.feign.IUserClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 申购单 服务实现类
- *
- * @author BladeX
- * @since 2022-07-26
- */
-@Service
-public class ApplyPurchaseServiceImpl extends ServiceImpl<ApplyPurchaseMapper, ApplyPurchase> implements IApplyPurchaseService {
-
-    @Autowired
-    private IApplyPurchasedetailService iApplyPurchasedetailService;
-
-    @Autowired
-    private IUserClient iUserClient;
-
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    @Override
-    public List<ApplyPurchase> getList(Map<String, Object> condition) {
-        return baseMapper.getList(condition);
-    }
-
-    /**
-     * 列表条数
-     *
-     * @param condition
-     * @return
-     */
-    @Override
-    public Integer getListCount(Map<String, Object> condition) {
-        return baseMapper.getListCount(condition);
-    }
-
-    /**
-     * 明细
-     *
-     * @param id
-     * @return
-     */
-    @Override
-    public ApplyPurchase detailApplyPurchase(String id) {
-        if (ObjectUtil.isEmpty(id)) {
-            throw new ServiceException("参数异常");
-        }
-        ApplyPurchase applyPurchase = getById(id);
-        if (ObjectUtil.isNotEmpty(applyPurchase)) {
-            User user = iUserClient.infoUser(applyPurchase.getCreateUser());
-            if (ObjectUtil.isNotEmpty(user)) {
-                applyPurchase.setUserName(user.getName());
-            }
-            List<ApplyPurchasedetail> list = iApplyPurchasedetailService.list(Wrappers.<ApplyPurchasedetail>query().lambda().
-                    eq(ApplyPurchasedetail::getApplyPurchaseId, id));
-            applyPurchase.setPurchasedetailList(list);
-        }
-        return applyPurchase;
-    }
-}

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/service/impl/ApplyPurchasedetailServiceImpl.java

@@ -1,56 +0,0 @@
-/*
- *      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.subscribe.service.impl;
-
-import com.fjhx.subscribe.entity.ApplyPurchasedetail;
-import com.fjhx.subscribe.mapper.ApplyPurchasedetailMapper;
-import com.fjhx.subscribe.service.IApplyPurchasedetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 申购单明细 服务实现类
- *
- * @author BladeX
- * @since 2022-07-26
- */
-@Service
-public class ApplyPurchasedetailServiceImpl extends ServiceImpl<ApplyPurchasedetailMapper, ApplyPurchasedetail> implements IApplyPurchasedetailService {
-
-    /**
-     * 列表
-     * @param condition
-     * @return
-     */
-    @Override
-    public List<ApplyPurchasedetail> getList(Map<String, Object> condition) {
-        return baseMapper.getList(condition);
-    }
-
-    /**
-     * 列表条数
-     * @param condition
-     * @return
-     */
-    @Override
-    public Integer getListCount(Map<String, Object> condition) {
-        return baseMapper.getListCount(condition);
-    }
-}

hx-service/storage-restructure/src/main/java/com/fjhx/supplier/controller/SupplierBankController.java

@@ -1,55 +0,0 @@
-/*
- *      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.SupplierBank;
-import com.fjhx.supplier.service.ISupplierBankService;
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 供应商收款账户 控制器
- *
- * @author BladeX
- * @since 2022-07-22
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/supplierbank")
-@Api(value = "供应商收款账户", tags = "供应商收款账户接口")
-public class SupplierBankController extends BladeController {
-
-    private final ISupplierBankService supplierBankService;
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<SupplierBank> detail(SupplierBank supplierBank) {
-        List<SupplierBank> list = supplierBankService.list(Condition.getQueryWrapper(supplierBank));
-        return R.list(list);
-    }
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/supplier/controller/SupplierContactsController.java

@@ -1,54 +0,0 @@
-/*
- *      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.SupplierContacts;
-import com.fjhx.supplier.service.ISupplierContactsService;
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 供应商联系人 控制器
- *
- * @author BladeX
- * @since 2022-07-25
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/suppliercontacts")
-@Api(value = "供应商联系人", tags = "供应商联系人接口")
-public class SupplierContactsController extends BladeController {
-
-    private final ISupplierContactsService supplierContactsService;
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<SupplierContacts> detail(SupplierContacts supplierContacts) {
-        List<SupplierContacts> list = supplierContactsService.list(Condition.getQueryWrapper(supplierContacts));
-        return R.list(list);
-    }
-}

hx-service/storage-restructure/src/main/java/com/fjhx/supplier/controller/SupplierController.java

@@ -1,111 +0,0 @@
-/*
- *      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 lombok.AllArgsConstructor;
-import org.springblade.common.utils.ListPageMap;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 供应商 控制器
- *
- * @author BladeX
- * @since 2022-07-22
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/supplier")
-@Api(value = "供应商", tags = "供应商接口")
-public class SupplierController extends BladeController {
-
-    private final ISupplierService supplierService;
-
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping("/list")
-    public R list(@RequestBody Map<String, Object> condition) {
-        ListPageMap.getListPageMap(condition);
-        List<Supplier> result = supplierService.getList(condition);
-        return R.success(result);
-    }
-
-    /**
-     * 列表条数
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping("/list/count")
-    public R listCount(@RequestBody Map<String, Object> condition) {
-        ListPageMap.getListPageMap(condition);
-        Integer count = supplierService.getListCount(condition);
-        return R.success(count);
-    }
-
-    /**
-     * 详情
-     */
-    @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) {
-        supplierService.addSupplier(supplier);
-        return R.success();
-    }
-
-    /**
-     * 修改 供应商
-     */
-    @PostMapping("/update")
-    public R update(@Valid @RequestBody Supplier supplier) {
-        supplierService.editSupplier(supplier);
-        return R.success();
-    }
-
-    /**
-     * 删除 供应商
-     */
-    @GetMapping("/remove")
-    public R remove(@RequestParam String id) {
-        supplierService.delSupplier(id);
-        return R.success();
-    }
-
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/supplier/controller/SupplierKeepController.java

@@ -1,56 +0,0 @@
-/*
- *      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.SupplierKeep;
-import com.fjhx.supplier.service.ISupplierKeepService;
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 供应商维护记录 控制器
- *
- * @author BladeX
- * @since 2022-07-22
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/supplierkeep")
-@Api(value = "供应商维护记录", tags = "供应商维护记录接口")
-public class SupplierKeepController extends BladeController {
-
-    private final ISupplierKeepService supplierKeepService;
-
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<SupplierKeep> detail(SupplierKeep supplierKeep) {
-        List<SupplierKeep> list = supplierKeepService.list(Condition.getQueryWrapper(supplierKeep));
-        return R.list(list);
-    }
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/supplier/controller/SupplierPriceController.java

@@ -1,88 +0,0 @@
-/*
- *      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.entity.SupplierPrice;
-import com.fjhx.supplier.service.ISupplierPriceService;
-import com.fjhx.supplier.service.ISupplierService;
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import org.springblade.common.utils.ListPageMap;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.api.R;
-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 javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 供应商价格 控制器
- *
- * @author BladeX
- * @since 2022-07-22
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/supplierprice")
-@Api(value = "供应商价格", tags = "供应商价格接口")
-public class SupplierPriceController extends BladeController {
-
-    private final ISupplierPriceService supplierPriceService;
-
-    private final ISupplierService iSupplierService;
-
-    /**
-     * 新增 供应商价格
-     */
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody SupplierPrice supplierPrice) {
-        supplierPrice.setCreate();
-        return R.status(supplierPriceService.save(supplierPrice));
-    }
-
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping("/list")
-    public R list(@RequestBody Map<String, Object> condition) {
-        ListPageMap.getListPageMap(condition);
-        List<Supplier> result = iSupplierService.getSuPriceList(condition);
-        return R.success(result);
-    }
-
-    /**
-     * 列表条数
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping("/list/count")
-    public R listCount(@RequestBody Map<String, Object> condition) {
-        ListPageMap.getListPageMap(condition);
-        Integer count = iSupplierService.getSuPriceListCount(condition);
-        return R.success(count);
-    }
-
-}