[功能]隆庆气体

Signed-off-by: 心笑峰 <411641505@qq.com>

README.en.md

@@ -1,36 +0,0 @@
-# ktg-mes
-
-#### Description
-一款开源、免费的MES生产执行管理系统
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

README.md

@@ -24,6 +24,7 @@
 - 当前开发进度请参考doc->开发进度->进度甘特图.xlsx
 - 第一版售前PPT请查看doc->售前资料->《苦糖果MES系统产品介绍（A4横板）.pptx》
 - 操作手册/软件说明书请参考doc->售前资料->《苦糖果生产执行管理系统-【软件说明书】.docx》
+- 完整数据库脚本请直接导入doc->实施文档->ktgmes****.sql.gz最新日期的压缩包。
 
 欢迎交流沟通：QQ：411641505
 

ktg-admin/src/main/java/com/ktg/RuoYiApplication.java

@@ -23,7 +23,7 @@ public class RuoYiApplication
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  KTM-MES启动成功   ლ(´ڡ`ლ)ﾞ  \n");
+        System.out.println("(♥◠‿◠)ﾉﾞ  陕西隆庆气体有限公司的平台 - 隆庆气体协同运营平台   ლ(´ڡ`ლ)ﾞ  \n");
     }
 
     @Bean

ktg-admin/src/main/java/com/ktg/web/controller/system/SysDeptController.java

@@ -116,8 +116,9 @@ public class SysDeptController extends BaseController
         {
             return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
-        String s = autoCodeUtil.genSerialCode("DEPT_CODE", null);
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptCodeUnique(dept))) {
-        dept.setDeptCode(s);
+            return AjaxResult.error("新增部门'" + dept.getDeptCode() + "'失败，部门编码已存在");
+        }
         dept.setCreateBy(getUsername());
         return toAjax(deptService.insertDept(dept));
     }
@@ -132,6 +133,9 @@ public class SysDeptController extends BaseController
     {
         Long deptId = dept.getDeptId();
         deptService.checkDeptDataScope(deptId);
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptCodeUnique(dept))) {
+            return AjaxResult.error("新增部门'" + dept.getDeptCode() + "'失败，部门编码已存在");
+        }
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
         {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");

ktg-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/j2eedb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/ktg-lqqt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: your_username
+                username: root
-                password: your_password
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ktg-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ktg-mes:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ktg/uploadPath，Linux配置 /home/ktg/uploadPath）
-  profile: D:/source_code/j2eeworkspace/ktg-mes/upload
+  profile: C:/source_code/j2eeworkspace/ktg-mes/upload
   #profile: /home/www/uploadPath
   # 获取ip地址开关
   addressEnabled: false

ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java

@@ -7,6 +7,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.ktg.common.constant.UserConstants;
 import com.ktg.mes.dv.domain.DvCheckMachinery;
 import com.ktg.mes.dv.domain.DvCheckSubject;
+import com.ktg.mes.dv.domain.dto.DvCheckPlanDTO;
 import com.ktg.mes.dv.service.IDvCheckMachineryService;
 import com.ktg.mes.dv.service.IDvCheckSubjectService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -150,4 +151,14 @@ public class DvCheckPlanController extends BaseController
 
         return toAjax(dvCheckPlanService.deleteDvCheckPlanByPlanIds(planIds));
     }
+
+    /**
+     * 根据设备编码和计划类型查询设备点检计划头列表
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('mes:dv:checkplan:list')")
+    @GetMapping("/getCheckPlan")
+    public AjaxResult getCheckPlan(DvCheckPlanDTO checkPlanDTO) {
+        return dvCheckPlanService.getCheckPlan(checkPlanDTO);
+    }
 }

ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvRepairController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ktg.common.constant.UserConstants;
+import com.ktg.mes.dv.domain.dto.DvRepairDTO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -109,4 +110,13 @@ public class DvRepairController extends BaseController
     {
         return toAjax(dvRepairService.deleteDvRepairByRepairIds(repairIds));
     }
+
+    /**
+     * 根据设备编码查询设备维修单列表
+     */
+    @PreAuthorize("@ss.hasPermi('mes:dv:repair:list')")
+    @GetMapping("/getRepairList")
+    public AjaxResult getRepairList(DvRepairDTO repairDTO) {
+        return dvRepairService.getRepairList(repairDTO);
+    }
 }

ktg-mes/src/main/java/com/ktg/mes/dv/domain/dto/DvCheckPlanDTO.java

@@ -0,0 +1,12 @@
+package com.ktg.mes.dv.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class DvCheckPlanDTO {
+
+    private String planType;
+
+    private String machineryCode;
+
+}

ktg-mes/src/main/java/com/ktg/mes/dv/domain/dto/DvRepairDTO.java

@@ -0,0 +1,10 @@
+package com.ktg.mes.dv.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class DvRepairDTO {
+
+    private String machineryCode;
+
+}

ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckMachineryMapper.java

@@ -2,6 +2,7 @@ package com.ktg.mes.dv.mapper;
 
 import java.util.List;
 import com.ktg.mes.dv.domain.DvCheckMachinery;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 点检设备Mapper接口
@@ -67,4 +68,11 @@ public interface DvCheckMachineryMapper
      * @return
      */
     public int deleteByPlanId(Long planId);
+
+    /**
+     * 根据设备编码获取相关计划id
+     * @param machineryCode
+     * @return
+     */
+    List<Long> getPlanId(@Param("machineryCode") String machineryCode);
 }

ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckPlanMapper.java

@@ -2,6 +2,8 @@ package com.ktg.mes.dv.mapper;
 
 import java.util.List;
 import com.ktg.mes.dv.domain.DvCheckPlan;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
 
 /**
  * 设备点检计划头Mapper接口
@@ -60,4 +62,6 @@ public interface DvCheckPlanMapper
      * @return 结果
      */
     public int deleteDvCheckPlanByPlanIds(Long[] planIds);
+
+    List<DvCheckPlan> getByIds(@Param("planIds") List<Long> planIds,@Param("planType") String planType);
 }

ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvRepairMapper.java

@@ -1,7 +1,9 @@
 package com.ktg.mes.dv.mapper;
 
 import java.util.List;
+
 import com.ktg.mes.dv.domain.DvRepair;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 设备维修单Mapper接口
@@ -61,4 +63,12 @@ public interface DvRepairMapper
      * @return 结果
      */
     public int deleteDvRepairByRepairIds(Long[] repairIds);
+
+    /**
+     * 根据设备编码查询设备维修单列表
+     *
+     * @param machineryCode
+     * @return
+     */
+    List<DvRepair> getRepairList(@Param("machineryCode") String machineryCode);
 }

ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckMachineryService.java

@@ -67,4 +67,11 @@ public interface IDvCheckMachineryService
      * @return
      */
     public int deleteByPlanId(Long planId);
+
+    /**
+     * 根据设备编码获取相关计划id
+     * @param machineryCode
+     * @return
+     */
+    List<Long> getPlanId(String machineryCode);
 }

ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckPlanService.java

@@ -1,7 +1,10 @@
 package com.ktg.mes.dv.service;
 
 import java.util.List;
+
+import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.mes.dv.domain.DvCheckPlan;
+import com.ktg.mes.dv.domain.dto.DvCheckPlanDTO;
 
 /**
  * 设备点检计划头Service接口
@@ -65,4 +68,11 @@ public interface IDvCheckPlanService
      * @return 结果
      */
     public int deleteDvCheckPlanByPlanId(Long planId);
+
+    /**
+     * 根据设备编码和计划类型查询设备点检计划头列表
+     * @return
+     */
+    AjaxResult getCheckPlan(DvCheckPlanDTO checkPlanDTO);
+
 }

ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvRepairService.java

@@ -1,7 +1,10 @@
 package com.ktg.mes.dv.service;
 
 import java.util.List;
+
+import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.mes.dv.domain.DvRepair;
+import com.ktg.mes.dv.domain.dto.DvRepairDTO;
 
 /**
  * 设备维修单Service接口
@@ -65,4 +68,11 @@ public interface IDvRepairService
      * @return 结果
      */
     public int deleteDvRepairByRepairId(Long repairId);
+
+    /**
+     * 根据设备编码查询设备维修单列表
+     * @param repairDTO
+     * @return
+     */
+    AjaxResult getRepairList(DvRepairDTO repairDTO);
 }

ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckMachineryServiceImpl.java

@@ -111,4 +111,9 @@ public class DvCheckMachineryServiceImpl implements IDvCheckMachineryService
     public int deleteByPlanId(Long planId) {
         return dvCheckMachineryMapper.deleteByPlanId(planId);
     }
+
+    @Override
+    public List<Long> getPlanId(String machineryCode) {
+        return dvCheckMachineryMapper.getPlanId(machineryCode);
+    }
 }

ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckPlanServiceImpl.java

@@ -3,8 +3,12 @@ package com.ktg.mes.dv.service.impl;
 import java.util.List;
 
 import com.ktg.common.constant.UserConstants;
+import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.common.utils.DateUtils;
 import com.ktg.common.utils.StringUtils;
+import com.ktg.mes.dv.domain.dto.DvCheckPlanDTO;
+import com.ktg.mes.dv.service.IDvCheckMachineryService;
+import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ktg.mes.dv.mapper.DvCheckPlanMapper;
@@ -23,6 +27,9 @@ public class DvCheckPlanServiceImpl implements IDvCheckPlanService
     @Autowired
     private DvCheckPlanMapper dvCheckPlanMapper;
 
+    @Autowired
+    private IDvCheckMachineryService dvCheckMachineryService;
+
     /**
      * 查询设备点检计划头
      * 
@@ -106,4 +113,20 @@ public class DvCheckPlanServiceImpl implements IDvCheckPlanService
     {
         return dvCheckPlanMapper.deleteDvCheckPlanByPlanId(planId);
     }
+
+    /**
+     * 根据设备编码和计划类型查询设备点检计划头列表
+     * @return
+     */
+    @Override
+    public AjaxResult getCheckPlan(DvCheckPlanDTO checkPlanDTO) {
+        // 根据设备编码获取相关计划id
+        List<Long> planIds =  dvCheckMachineryService.getPlanId(checkPlanDTO.getMachineryCode());
+        if (planIds != null && planIds.size() > 0) {
+            // 根据设备编码和计划类型获取相关设备点检计划头列表
+            List<DvCheckPlan> list = dvCheckPlanMapper.getByIds(planIds, checkPlanDTO.getPlanType());
+            return AjaxResult.success(list);
+        }
+        return AjaxResult.success();
+    }
 }

ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvRepairServiceImpl.java

@@ -3,8 +3,10 @@ package com.ktg.mes.dv.service.impl;
 import java.util.List;
 
 import com.ktg.common.constant.UserConstants;
+import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.common.utils.DateUtils;
 import com.ktg.common.utils.StringUtils;
+import com.ktg.mes.dv.domain.dto.DvRepairDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ktg.mes.dv.mapper.DvRepairMapper;
@@ -106,4 +108,15 @@ public class DvRepairServiceImpl implements IDvRepairService
     {
         return dvRepairMapper.deleteDvRepairByRepairId(repairId);
     }
+
+    /**
+     * 根据设备编码查询设备维修单列表
+     * @param repairDTO
+     * @return
+     */
+    @Override
+    public AjaxResult getRepairList(DvRepairDTO repairDTO) {
+        List<DvRepair> list = dvRepairMapper.getRepairList(repairDTO.getMachineryCode());
+        return AjaxResult.success(list);
+    }
 }

ktg-mes/src/main/java/com/ktg/mes/md/controller/HtBaoxiaoController.java

@@ -0,0 +1,104 @@
+package com.ktg.mes.md.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.core.domain.AjaxResult;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.mes.md.domain.HtBaoxiao;
+import com.ktg.mes.md.service.IHtBaoxiaoService;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.common.core.page.TableDataInfo;
+
+/**
+ * 报销Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+@RestController
+@RequestMapping("/md/baoxiao")
+public class HtBaoxiaoController extends BaseController
+{
+    @Autowired
+    private IHtBaoxiaoService htBaoxiaoService;
+
+    /**
+     * 查询报销列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:baoxiao:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(HtBaoxiao htBaoxiao)
+    {
+        startPage();
+        List<HtBaoxiao> list = htBaoxiaoService.selectHtBaoxiaoList(htBaoxiao);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出报销列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:baoxiao:export')")
+    @Log(title = "报销", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, HtBaoxiao htBaoxiao)
+    {
+        List<HtBaoxiao> list = htBaoxiaoService.selectHtBaoxiaoList(htBaoxiao);
+        ExcelUtil<HtBaoxiao> util = new ExcelUtil<HtBaoxiao>(HtBaoxiao.class);
+        util.exportExcel(response, list, "报销数据");
+    }
+
+    /**
+     * 获取报销详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:baoxiao:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return AjaxResult.success(htBaoxiaoService.selectHtBaoxiaoById(id));
+    }
+
+    /**
+     * 新增报销
+     */
+    @PreAuthorize("@ss.hasPermi('md:baoxiao:add')")
+    @Log(title = "报销", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody HtBaoxiao htBaoxiao)
+    {
+        return toAjax(htBaoxiaoService.insertHtBaoxiao(htBaoxiao));
+    }
+
+    /**
+     * 修改报销
+     */
+    @PreAuthorize("@ss.hasPermi('md:baoxiao:edit')")
+    @Log(title = "报销", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody HtBaoxiao htBaoxiao)
+    {
+        return toAjax(htBaoxiaoService.updateHtBaoxiao(htBaoxiao));
+    }
+
+    /**
+     * 删除报销
+     */
+    @PreAuthorize("@ss.hasPermi('md:baoxiao:remove')")
+    @Log(title = "报销", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(htBaoxiaoService.deleteHtBaoxiaoByIds(ids));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/controller/HtGglController.java

@@ -0,0 +1,104 @@
+package com.ktg.mes.md.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.core.domain.AjaxResult;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.mes.md.domain.HtGgl;
+import com.ktg.mes.md.service.IHtGglService;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.common.core.page.TableDataInfo;
+
+/**
+ * 公告栏Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+@RestController
+@RequestMapping("/md/ggl")
+public class HtGglController extends BaseController
+{
+    @Autowired
+    private IHtGglService htGglService;
+
+    /**
+     * 查询公告栏列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:ggl:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(HtGgl htGgl)
+    {
+        startPage();
+        List<HtGgl> list = htGglService.selectHtGglList(htGgl);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出公告栏列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:ggl:export')")
+    @Log(title = "公告栏", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, HtGgl htGgl)
+    {
+        List<HtGgl> list = htGglService.selectHtGglList(htGgl);
+        ExcelUtil<HtGgl> util = new ExcelUtil<HtGgl>(HtGgl.class);
+        util.exportExcel(response, list, "公告栏数据");
+    }
+
+    /**
+     * 获取公告栏详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:ggl:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return AjaxResult.success(htGglService.selectHtGglById(id));
+    }
+
+    /**
+     * 新增公告栏
+     */
+    @PreAuthorize("@ss.hasPermi('md:ggl:add')")
+    @Log(title = "公告栏", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody HtGgl htGgl)
+    {
+        return toAjax(htGglService.insertHtGgl(htGgl));
+    }
+
+    /**
+     * 修改公告栏
+     */
+    @PreAuthorize("@ss.hasPermi('md:ggl:edit')")
+    @Log(title = "公告栏", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody HtGgl htGgl)
+    {
+        return toAjax(htGglService.updateHtGgl(htGgl));
+    }
+
+    /**
+     * 删除公告栏
+     */
+    @PreAuthorize("@ss.hasPermi('md:ggl:remove')")
+    @Log(title = "公告栏", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(htGglService.deleteHtGglByIds(ids));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/controller/HtHetongController.java

@@ -0,0 +1,104 @@
+package com.ktg.mes.md.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.core.domain.AjaxResult;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.mes.md.domain.HtHetong;
+import com.ktg.mes.md.service.IHtHetongService;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.common.core.page.TableDataInfo;
+
+/**
+ * 合同管理Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+@RestController
+@RequestMapping("/md/hetong")
+public class HtHetongController extends BaseController
+{
+    @Autowired
+    private IHtHetongService htHetongService;
+
+    /**
+     * 查询合同管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:hetong:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(HtHetong htHetong)
+    {
+        startPage();
+        List<HtHetong> list = htHetongService.selectHtHetongList(htHetong);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出合同管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:hetong:export')")
+    @Log(title = "合同管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, HtHetong htHetong)
+    {
+        List<HtHetong> list = htHetongService.selectHtHetongList(htHetong);
+        ExcelUtil<HtHetong> util = new ExcelUtil<HtHetong>(HtHetong.class);
+        util.exportExcel(response, list, "合同管理数据");
+    }
+
+    /**
+     * 获取合同管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:hetong:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return AjaxResult.success(htHetongService.selectHtHetongById(id));
+    }
+
+    /**
+     * 新增合同管理
+     */
+    @PreAuthorize("@ss.hasPermi('md:hetong:add')")
+    @Log(title = "合同管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody HtHetong htHetong)
+    {
+        return toAjax(htHetongService.insertHtHetong(htHetong));
+    }
+
+    /**
+     * 修改合同管理
+     */
+    @PreAuthorize("@ss.hasPermi('md:hetong:edit')")
+    @Log(title = "合同管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody HtHetong htHetong)
+    {
+        return toAjax(htHetongService.updateHtHetong(htHetong));
+    }
+
+    /**
+     * 删除合同管理
+     */
+    @PreAuthorize("@ss.hasPermi('md:hetong:remove')")
+    @Log(title = "合同管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(htHetongService.deleteHtHetongByIds(ids));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/controller/HtJczcKehutongjiController.java

@@ -0,0 +1,104 @@
+package com.ktg.mes.md.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.core.domain.AjaxResult;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.mes.md.domain.HtJczcKehutongji;
+import com.ktg.mes.md.service.IHtJczcKehutongjiService;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.common.core.page.TableDataInfo;
+
+/**
+ * 客户统计报Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@RestController
+@RequestMapping("/md/kehutongji")
+public class HtJczcKehutongjiController extends BaseController
+{
+    @Autowired
+    private IHtJczcKehutongjiService htJczcKehutongjiService;
+
+    /**
+     * 查询客户统计报列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:kehutongji:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(HtJczcKehutongji htJczcKehutongji)
+    {
+        startPage();
+        List<HtJczcKehutongji> list = htJczcKehutongjiService.selectHtJczcKehutongjiList(htJczcKehutongji);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出客户统计报列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:kehutongji:export')")
+    @Log(title = "客户统计报", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, HtJczcKehutongji htJczcKehutongji)
+    {
+        List<HtJczcKehutongji> list = htJczcKehutongjiService.selectHtJczcKehutongjiList(htJczcKehutongji);
+        ExcelUtil<HtJczcKehutongji> util = new ExcelUtil<HtJczcKehutongji>(HtJczcKehutongji.class);
+        util.exportExcel(response, list, "客户统计报数据");
+    }
+
+    /**
+     * 获取客户统计报详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:kehutongji:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return AjaxResult.success(htJczcKehutongjiService.selectHtJczcKehutongjiById(id));
+    }
+
+    /**
+     * 新增客户统计报
+     */
+    @PreAuthorize("@ss.hasPermi('md:kehutongji:add')")
+    @Log(title = "客户统计报", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody HtJczcKehutongji htJczcKehutongji)
+    {
+        return toAjax(htJczcKehutongjiService.insertHtJczcKehutongji(htJczcKehutongji));
+    }
+
+    /**
+     * 修改客户统计报
+     */
+    @PreAuthorize("@ss.hasPermi('md:kehutongji:edit')")
+    @Log(title = "客户统计报", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody HtJczcKehutongji htJczcKehutongji)
+    {
+        return toAjax(htJczcKehutongjiService.updateHtJczcKehutongji(htJczcKehutongji));
+    }
+
+    /**
+     * 删除客户统计报
+     */
+    @PreAuthorize("@ss.hasPermi('md:kehutongji:remove')")
+    @Log(title = "客户统计报", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(htJczcKehutongjiService.deleteHtJczcKehutongjiByIds(ids));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/controller/HtJczcKucuntongjiController.java

@@ -0,0 +1,104 @@
+package com.ktg.mes.md.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.core.domain.AjaxResult;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.mes.md.domain.HtJczcKucuntongji;
+import com.ktg.mes.md.service.IHtJczcKucuntongjiService;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.common.core.page.TableDataInfo;
+
+/**
+ * 库存统计报Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@RestController
+@RequestMapping("/md/kucuntongji")
+public class HtJczcKucuntongjiController extends BaseController
+{
+    @Autowired
+    private IHtJczcKucuntongjiService htJczcKucuntongjiService;
+
+    /**
+     * 查询库存统计报列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:kucuntongji:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(HtJczcKucuntongji htJczcKucuntongji)
+    {
+        startPage();
+        List<HtJczcKucuntongji> list = htJczcKucuntongjiService.selectHtJczcKucuntongjiList(htJczcKucuntongji);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存统计报列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:kucuntongji:export')")
+    @Log(title = "库存统计报", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, HtJczcKucuntongji htJczcKucuntongji)
+    {
+        List<HtJczcKucuntongji> list = htJczcKucuntongjiService.selectHtJczcKucuntongjiList(htJczcKucuntongji);
+        ExcelUtil<HtJczcKucuntongji> util = new ExcelUtil<HtJczcKucuntongji>(HtJczcKucuntongji.class);
+        util.exportExcel(response, list, "库存统计报数据");
+    }
+
+    /**
+     * 获取库存统计报详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:kucuntongji:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return AjaxResult.success(htJczcKucuntongjiService.selectHtJczcKucuntongjiById(id));
+    }
+
+    /**
+     * 新增库存统计报
+     */
+    @PreAuthorize("@ss.hasPermi('md:kucuntongji:add')")
+    @Log(title = "库存统计报", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody HtJczcKucuntongji htJczcKucuntongji)
+    {
+        return toAjax(htJczcKucuntongjiService.insertHtJczcKucuntongji(htJczcKucuntongji));
+    }
+
+    /**
+     * 修改库存统计报
+     */
+    @PreAuthorize("@ss.hasPermi('md:kucuntongji:edit')")
+    @Log(title = "库存统计报", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody HtJczcKucuntongji htJczcKucuntongji)
+    {
+        return toAjax(htJczcKucuntongjiService.updateHtJczcKucuntongji(htJczcKucuntongji));
+    }
+
+    /**
+     * 删除库存统计报
+     */
+    @PreAuthorize("@ss.hasPermi('md:kucuntongji:remove')")
+    @Log(title = "库存统计报", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(htJczcKucuntongjiService.deleteHtJczcKucuntongjiByIds(ids));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/controller/HtJczcQipingtongjiController.java

@@ -0,0 +1,104 @@
+package com.ktg.mes.md.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.core.domain.AjaxResult;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.mes.md.domain.HtJczcQipingtongji;
+import com.ktg.mes.md.service.IHtJczcQipingtongjiService;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.common.core.page.TableDataInfo;
+
+/**
+ * 气瓶统计报Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@RestController
+@RequestMapping("/md/qipingtongji")
+public class HtJczcQipingtongjiController extends BaseController
+{
+    @Autowired
+    private IHtJczcQipingtongjiService htJczcQipingtongjiService;
+
+    /**
+     * 查询气瓶统计报列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:qipingtongji:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(HtJczcQipingtongji htJczcQipingtongji)
+    {
+        startPage();
+        List<HtJczcQipingtongji> list = htJczcQipingtongjiService.selectHtJczcQipingtongjiList(htJczcQipingtongji);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出气瓶统计报列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:qipingtongji:export')")
+    @Log(title = "气瓶统计报", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, HtJczcQipingtongji htJczcQipingtongji)
+    {
+        List<HtJczcQipingtongji> list = htJczcQipingtongjiService.selectHtJczcQipingtongjiList(htJczcQipingtongji);
+        ExcelUtil<HtJczcQipingtongji> util = new ExcelUtil<HtJczcQipingtongji>(HtJczcQipingtongji.class);
+        util.exportExcel(response, list, "气瓶统计报数据");
+    }
+
+    /**
+     * 获取气瓶统计报详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:qipingtongji:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return AjaxResult.success(htJczcQipingtongjiService.selectHtJczcQipingtongjiById(id));
+    }
+
+    /**
+     * 新增气瓶统计报
+     */
+    @PreAuthorize("@ss.hasPermi('md:qipingtongji:add')")
+    @Log(title = "气瓶统计报", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody HtJczcQipingtongji htJczcQipingtongji)
+    {
+        return toAjax(htJczcQipingtongjiService.insertHtJczcQipingtongji(htJczcQipingtongji));
+    }
+
+    /**
+     * 修改气瓶统计报
+     */
+    @PreAuthorize("@ss.hasPermi('md:qipingtongji:edit')")
+    @Log(title = "气瓶统计报", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody HtJczcQipingtongji htJczcQipingtongji)
+    {
+        return toAjax(htJczcQipingtongjiService.updateHtJczcQipingtongji(htJczcQipingtongji));
+    }
+
+    /**
+     * 删除气瓶统计报
+     */
+    @PreAuthorize("@ss.hasPermi('md:qipingtongji:remove')")
+    @Log(title = "气瓶统计报", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(htJczcQipingtongjiService.deleteHtJczcQipingtongjiByIds(ids));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/controller/HtJczcXiaoshoutongjiController.java

@@ -0,0 +1,104 @@
+package com.ktg.mes.md.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.core.domain.AjaxResult;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.mes.md.domain.HtJczcXiaoshoutongji;
+import com.ktg.mes.md.service.IHtJczcXiaoshoutongjiService;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.common.core.page.TableDataInfo;
+
+/**
+ * 销售统计报Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@RestController
+@RequestMapping("/md/xiaoshoutongji")
+public class HtJczcXiaoshoutongjiController extends BaseController
+{
+    @Autowired
+    private IHtJczcXiaoshoutongjiService htJczcXiaoshoutongjiService;
+
+    /**
+     * 查询销售统计报列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:xiaoshoutongji:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(HtJczcXiaoshoutongji htJczcXiaoshoutongji)
+    {
+        startPage();
+        List<HtJczcXiaoshoutongji> list = htJczcXiaoshoutongjiService.selectHtJczcXiaoshoutongjiList(htJczcXiaoshoutongji);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出销售统计报列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:xiaoshoutongji:export')")
+    @Log(title = "销售统计报", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, HtJczcXiaoshoutongji htJczcXiaoshoutongji)
+    {
+        List<HtJczcXiaoshoutongji> list = htJczcXiaoshoutongjiService.selectHtJczcXiaoshoutongjiList(htJczcXiaoshoutongji);
+        ExcelUtil<HtJczcXiaoshoutongji> util = new ExcelUtil<HtJczcXiaoshoutongji>(HtJczcXiaoshoutongji.class);
+        util.exportExcel(response, list, "销售统计报数据");
+    }
+
+    /**
+     * 获取销售统计报详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:xiaoshoutongji:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return AjaxResult.success(htJczcXiaoshoutongjiService.selectHtJczcXiaoshoutongjiById(id));
+    }
+
+    /**
+     * 新增销售统计报
+     */
+    @PreAuthorize("@ss.hasPermi('md:xiaoshoutongji:add')")
+    @Log(title = "销售统计报", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody HtJczcXiaoshoutongji htJczcXiaoshoutongji)
+    {
+        return toAjax(htJczcXiaoshoutongjiService.insertHtJczcXiaoshoutongji(htJczcXiaoshoutongji));
+    }
+
+    /**
+     * 修改销售统计报
+     */
+    @PreAuthorize("@ss.hasPermi('md:xiaoshoutongji:edit')")
+    @Log(title = "销售统计报", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody HtJczcXiaoshoutongji htJczcXiaoshoutongji)
+    {
+        return toAjax(htJczcXiaoshoutongjiService.updateHtJczcXiaoshoutongji(htJczcXiaoshoutongji));
+    }
+
+    /**
+     * 删除销售统计报
+     */
+    @PreAuthorize("@ss.hasPermi('md:xiaoshoutongji:remove')")
+    @Log(title = "销售统计报", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(htJczcXiaoshoutongjiService.deleteHtJczcXiaoshoutongjiByIds(ids));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/controller/HtQingjiaController.java

@@ -0,0 +1,104 @@
+package com.ktg.mes.md.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.core.domain.AjaxResult;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.mes.md.domain.HtQingjia;
+import com.ktg.mes.md.service.IHtQingjiaService;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.common.core.page.TableDataInfo;
+
+/**
+ * 请假Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+@RestController
+@RequestMapping("/md/qingjia")
+public class HtQingjiaController extends BaseController
+{
+    @Autowired
+    private IHtQingjiaService htQingjiaService;
+
+    /**
+     * 查询请假列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:qingjia:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(HtQingjia htQingjia)
+    {
+        startPage();
+        List<HtQingjia> list = htQingjiaService.selectHtQingjiaList(htQingjia);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出请假列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:qingjia:export')")
+    @Log(title = "请假", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, HtQingjia htQingjia)
+    {
+        List<HtQingjia> list = htQingjiaService.selectHtQingjiaList(htQingjia);
+        ExcelUtil<HtQingjia> util = new ExcelUtil<HtQingjia>(HtQingjia.class);
+        util.exportExcel(response, list, "请假数据");
+    }
+
+    /**
+     * 获取请假详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:qingjia:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return AjaxResult.success(htQingjiaService.selectHtQingjiaById(id));
+    }
+
+    /**
+     * 新增请假
+     */
+    @PreAuthorize("@ss.hasPermi('md:qingjia:add')")
+    @Log(title = "请假", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody HtQingjia htQingjia)
+    {
+        return toAjax(htQingjiaService.insertHtQingjia(htQingjia));
+    }
+
+    /**
+     * 修改请假
+     */
+    @PreAuthorize("@ss.hasPermi('md:qingjia:edit')")
+    @Log(title = "请假", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody HtQingjia htQingjia)
+    {
+        return toAjax(htQingjiaService.updateHtQingjia(htQingjia));
+    }
+
+    /**
+     * 删除请假
+     */
+    @PreAuthorize("@ss.hasPermi('md:qingjia:remove')")
+    @Log(title = "请假", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(htQingjiaService.deleteHtQingjiaByIds(ids));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/controller/HtWeipanController.java

@@ -0,0 +1,104 @@
+package com.ktg.mes.md.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.core.domain.AjaxResult;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.mes.md.domain.HtWeipan;
+import com.ktg.mes.md.service.IHtWeipanService;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.common.core.page.TableDataInfo;
+
+/**
+ * 微盘管理Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+@RestController
+@RequestMapping("/md/weipan")
+public class HtWeipanController extends BaseController
+{
+    @Autowired
+    private IHtWeipanService htWeipanService;
+
+    /**
+     * 查询微盘管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:weipan:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(HtWeipan htWeipan)
+    {
+        startPage();
+        List<HtWeipan> list = htWeipanService.selectHtWeipanList(htWeipan);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出微盘管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:weipan:export')")
+    @Log(title = "微盘管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, HtWeipan htWeipan)
+    {
+        List<HtWeipan> list = htWeipanService.selectHtWeipanList(htWeipan);
+        ExcelUtil<HtWeipan> util = new ExcelUtil<HtWeipan>(HtWeipan.class);
+        util.exportExcel(response, list, "微盘管理数据");
+    }
+
+    /**
+     * 获取微盘管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:weipan:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(htWeipanService.selectHtWeipanById(id));
+    }
+
+    /**
+     * 新增微盘管理
+     */
+    @PreAuthorize("@ss.hasPermi('md:weipan:add')")
+    @Log(title = "微盘管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody HtWeipan htWeipan)
+    {
+        return toAjax(htWeipanService.insertHtWeipan(htWeipan));
+    }
+
+    /**
+     * 修改微盘管理
+     */
+    @PreAuthorize("@ss.hasPermi('md:weipan:edit')")
+    @Log(title = "微盘管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody HtWeipan htWeipan)
+    {
+        return toAjax(htWeipanService.updateHtWeipan(htWeipan));
+    }
+
+    /**
+     * 删除微盘管理
+     */
+    @PreAuthorize("@ss.hasPermi('md:weipan:remove')")
+    @Log(title = "微盘管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(htWeipanService.deleteHtWeipanByIds(ids));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/controller/HtZhiliangfenxiController.java

@@ -0,0 +1,104 @@
+package com.ktg.mes.md.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.core.domain.AjaxResult;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.mes.md.domain.HtZhiliangfenxi;
+import com.ktg.mes.md.service.IHtZhiliangfenxiService;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.common.core.page.TableDataInfo;
+
+/**
+ * 数据统计与分析Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@RestController
+@RequestMapping("/md/zhiliangfenxi")
+public class HtZhiliangfenxiController extends BaseController
+{
+    @Autowired
+    private IHtZhiliangfenxiService htZhiliangfenxiService;
+
+    /**
+     * 查询数据统计与分析列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:zhiliangfenxi:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(HtZhiliangfenxi htZhiliangfenxi)
+    {
+        startPage();
+        List<HtZhiliangfenxi> list = htZhiliangfenxiService.selectHtZhiliangfenxiList(htZhiliangfenxi);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出数据统计与分析列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:zhiliangfenxi:export')")
+    @Log(title = "数据统计与分析", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, HtZhiliangfenxi htZhiliangfenxi)
+    {
+        List<HtZhiliangfenxi> list = htZhiliangfenxiService.selectHtZhiliangfenxiList(htZhiliangfenxi);
+        ExcelUtil<HtZhiliangfenxi> util = new ExcelUtil<HtZhiliangfenxi>(HtZhiliangfenxi.class);
+        util.exportExcel(response, list, "数据统计与分析数据");
+    }
+
+    /**
+     * 获取数据统计与分析详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:zhiliangfenxi:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return AjaxResult.success(htZhiliangfenxiService.selectHtZhiliangfenxiById(id));
+    }
+
+    /**
+     * 新增数据统计与分析
+     */
+    @PreAuthorize("@ss.hasPermi('md:zhiliangfenxi:add')")
+    @Log(title = "数据统计与分析", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody HtZhiliangfenxi htZhiliangfenxi)
+    {
+        return toAjax(htZhiliangfenxiService.insertHtZhiliangfenxi(htZhiliangfenxi));
+    }
+
+    /**
+     * 修改数据统计与分析
+     */
+    @PreAuthorize("@ss.hasPermi('md:zhiliangfenxi:edit')")
+    @Log(title = "数据统计与分析", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody HtZhiliangfenxi htZhiliangfenxi)
+    {
+        return toAjax(htZhiliangfenxiService.updateHtZhiliangfenxi(htZhiliangfenxi));
+    }
+
+    /**
+     * 删除数据统计与分析
+     */
+    @PreAuthorize("@ss.hasPermi('md:zhiliangfenxi:remove')")
+    @Log(title = "数据统计与分析", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(htZhiliangfenxiService.deleteHtZhiliangfenxiByIds(ids));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/domain/HtBaoxiao.java

@@ -0,0 +1,96 @@
+package com.ktg.mes.md.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.BaseEntity;
+
+/**
+ * 报销对象 ht_baoxiao
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+public class HtBaoxiao extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Integer id;
+
+    /** 类型 */
+    @Excel(name = "类型")
+    private String leixing;
+
+    /** 原因 */
+    @Excel(name = "原因")
+    private String yuanyin;
+
+    /** 金额 */
+    @Excel(name = "金额")
+    private Double jine;
+
+    /** 时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date shijian;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setLeixing(String leixing) 
+    {
+        this.leixing = leixing;
+    }
+
+    public String getLeixing() 
+    {
+        return leixing;
+    }
+    public void setYuanyin(String yuanyin) 
+    {
+        this.yuanyin = yuanyin;
+    }
+
+    public String getYuanyin() 
+    {
+        return yuanyin;
+    }
+    public void setJine(Double jine) 
+    {
+        this.jine = jine;
+    }
+
+    public Double getJine() 
+    {
+        return jine;
+    }
+    public void setShijian(Date shijian) 
+    {
+        this.shijian = shijian;
+    }
+
+    public Date getShijian() 
+    {
+        return shijian;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("leixing", getLeixing())
+            .append("yuanyin", getYuanyin())
+            .append("jine", getJine())
+            .append("shijian", getShijian())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/domain/HtGgl.java

@@ -0,0 +1,82 @@
+package com.ktg.mes.md.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.BaseEntity;
+
+/**
+ * 公告栏对象 ht_ggl
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+public class HtGgl extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    private String biaoti;
+
+    /** 时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date shijian;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String neirong;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setBiaoti(String biaoti) 
+    {
+        this.biaoti = biaoti;
+    }
+
+    public String getBiaoti() 
+    {
+        return biaoti;
+    }
+    public void setShijian(Date shijian) 
+    {
+        this.shijian = shijian;
+    }
+
+    public Date getShijian() 
+    {
+        return shijian;
+    }
+    public void setNeirong(String neirong) 
+    {
+        this.neirong = neirong;
+    }
+
+    public String getNeirong() 
+    {
+        return neirong;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("biaoti", getBiaoti())
+            .append("shijian", getShijian())
+            .append("neirong", getNeirong())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/domain/HtHetong.java

@@ -0,0 +1,110 @@
+package com.ktg.mes.md.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.BaseEntity;
+
+/**
+ * 合同管理对象 ht_hetong
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+public class HtHetong extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 合同编号 */
+    @Excel(name = "合同编号")
+    private String bianhao;
+
+    /** 合同名称 */
+    @Excel(name = "合同名称")
+    private String mingcheng;
+
+    /** 合同金额 */
+    @Excel(name = "合同金额")
+    private Double jine;
+
+    /** 合同时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "合同时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date shijian;
+
+    /** 合同内容 */
+    @Excel(name = "合同内容")
+    private String neirong;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setBianhao(String bianhao) 
+    {
+        this.bianhao = bianhao;
+    }
+
+    public String getBianhao() 
+    {
+        return bianhao;
+    }
+    public void setMingcheng(String mingcheng) 
+    {
+        this.mingcheng = mingcheng;
+    }
+
+    public String getMingcheng() 
+    {
+        return mingcheng;
+    }
+    public void setJine(Double jine) 
+    {
+        this.jine = jine;
+    }
+
+    public Double getJine() 
+    {
+        return jine;
+    }
+    public void setShijian(Date shijian) 
+    {
+        this.shijian = shijian;
+    }
+
+    public Date getShijian() 
+    {
+        return shijian;
+    }
+    public void setNeirong(String neirong) 
+    {
+        this.neirong = neirong;
+    }
+
+    public String getNeirong() 
+    {
+        return neirong;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("bianhao", getBianhao())
+            .append("mingcheng", getMingcheng())
+            .append("jine", getJine())
+            .append("shijian", getShijian())
+            .append("neirong", getNeirong())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/domain/HtJczcKehutongji.java

@@ -0,0 +1,379 @@
+package com.ktg.mes.md.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.BaseEntity;
+
+/**
+ * 客户统计报对象 ht_jczc_kehutongji
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public class HtJczcKehutongji extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 客户名称 */
+    @Excel(name = "客户名称")
+    private String customerName;
+
+    /** 客户类型 */
+    @Excel(name = "客户类型")
+    private String customerType;
+
+    /** 联系人姓名 */
+    @Excel(name = "联系人姓名")
+    private String contactName;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String contactPhone;
+
+    /** 客户所在地区 */
+    @Excel(name = "客户所在地区")
+    private String region;
+
+    /** 总销售额 */
+    @Excel(name = "总销售额")
+    private BigDecimal totalSales;
+
+    /** 总销售量 */
+    @Excel(name = "总销售量")
+    private BigDecimal totalQuantity;
+
+    /** 平均单价 */
+    @Excel(name = "平均单价")
+    private BigDecimal averageUnitPrice;
+
+    /** 最大订单金额 */
+    @Excel(name = "最大订单金额")
+    private BigDecimal largestOrder;
+
+    /** 平均订单金额 */
+    @Excel(name = "平均订单金额")
+    private BigDecimal averageOrderValue;
+
+    /** 直销销售额 */
+    @Excel(name = "直销销售额")
+    private BigDecimal directSales;
+
+    /** 代理商销售额 */
+    @Excel(name = "代理商销售额")
+    private BigDecimal agentSales;
+
+    /** 电商平台销售额 */
+    @Excel(name = "电商平台销售额")
+    private BigDecimal onlineSales;
+
+    /** 气体产品销售额 */
+    @Excel(name = "气体产品销售额")
+    private BigDecimal gasSales;
+
+    /** 设备销售额 */
+    @Excel(name = "设备销售额")
+    private BigDecimal equipmentSales;
+
+    /** 服务销售额 */
+    @Excel(name = "服务销售额")
+    private BigDecimal serviceSales;
+
+    /** 首次下单日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "首次下单日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date firstOrderDate;
+
+    /** 最近下单日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最近下单日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date lastOrderDate;
+
+    /** 累计订单数 */
+    @Excel(name = "累计订单数")
+    private Integer totalOrders;
+
+    /** 复购率 */
+    @Excel(name = "复购率")
+    private BigDecimal repeatPurchaseRate;
+
+    /** 累计支付金额 */
+    @Excel(name = "累计支付金额")
+    private BigDecimal totalPayments;
+
+    /** 累计退款金额 */
+    @Excel(name = "累计退款金额")
+    private BigDecimal totalRefunds;
+
+    /** 未结清金额 */
+    @Excel(name = "未结清金额")
+    private BigDecimal outstandingBalance;
+
+    /** 统计周期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "统计周期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date statisticPeriod;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setCustomerName(String customerName) 
+    {
+        this.customerName = customerName;
+    }
+
+    public String getCustomerName() 
+    {
+        return customerName;
+    }
+    public void setCustomerType(String customerType) 
+    {
+        this.customerType = customerType;
+    }
+
+    public String getCustomerType() 
+    {
+        return customerType;
+    }
+    public void setContactName(String contactName) 
+    {
+        this.contactName = contactName;
+    }
+
+    public String getContactName() 
+    {
+        return contactName;
+    }
+    public void setContactPhone(String contactPhone) 
+    {
+        this.contactPhone = contactPhone;
+    }
+
+    public String getContactPhone() 
+    {
+        return contactPhone;
+    }
+    public void setRegion(String region) 
+    {
+        this.region = region;
+    }
+
+    public String getRegion() 
+    {
+        return region;
+    }
+    public void setTotalSales(BigDecimal totalSales) 
+    {
+        this.totalSales = totalSales;
+    }
+
+    public BigDecimal getTotalSales() 
+    {
+        return totalSales;
+    }
+    public void setTotalQuantity(BigDecimal totalQuantity) 
+    {
+        this.totalQuantity = totalQuantity;
+    }
+
+    public BigDecimal getTotalQuantity() 
+    {
+        return totalQuantity;
+    }
+    public void setAverageUnitPrice(BigDecimal averageUnitPrice) 
+    {
+        this.averageUnitPrice = averageUnitPrice;
+    }
+
+    public BigDecimal getAverageUnitPrice() 
+    {
+        return averageUnitPrice;
+    }
+    public void setLargestOrder(BigDecimal largestOrder) 
+    {
+        this.largestOrder = largestOrder;
+    }
+
+    public BigDecimal getLargestOrder() 
+    {
+        return largestOrder;
+    }
+    public void setAverageOrderValue(BigDecimal averageOrderValue) 
+    {
+        this.averageOrderValue = averageOrderValue;
+    }
+
+    public BigDecimal getAverageOrderValue() 
+    {
+        return averageOrderValue;
+    }
+    public void setDirectSales(BigDecimal directSales) 
+    {
+        this.directSales = directSales;
+    }
+
+    public BigDecimal getDirectSales() 
+    {
+        return directSales;
+    }
+    public void setAgentSales(BigDecimal agentSales) 
+    {
+        this.agentSales = agentSales;
+    }
+
+    public BigDecimal getAgentSales() 
+    {
+        return agentSales;
+    }
+    public void setOnlineSales(BigDecimal onlineSales) 
+    {
+        this.onlineSales = onlineSales;
+    }
+
+    public BigDecimal getOnlineSales() 
+    {
+        return onlineSales;
+    }
+    public void setGasSales(BigDecimal gasSales) 
+    {
+        this.gasSales = gasSales;
+    }
+
+    public BigDecimal getGasSales() 
+    {
+        return gasSales;
+    }
+    public void setEquipmentSales(BigDecimal equipmentSales) 
+    {
+        this.equipmentSales = equipmentSales;
+    }
+
+    public BigDecimal getEquipmentSales() 
+    {
+        return equipmentSales;
+    }
+    public void setServiceSales(BigDecimal serviceSales) 
+    {
+        this.serviceSales = serviceSales;
+    }
+
+    public BigDecimal getServiceSales() 
+    {
+        return serviceSales;
+    }
+    public void setFirstOrderDate(Date firstOrderDate) 
+    {
+        this.firstOrderDate = firstOrderDate;
+    }
+
+    public Date getFirstOrderDate() 
+    {
+        return firstOrderDate;
+    }
+    public void setLastOrderDate(Date lastOrderDate) 
+    {
+        this.lastOrderDate = lastOrderDate;
+    }
+
+    public Date getLastOrderDate() 
+    {
+        return lastOrderDate;
+    }
+    public void setTotalOrders(Integer totalOrders) 
+    {
+        this.totalOrders = totalOrders;
+    }
+
+    public Integer getTotalOrders() 
+    {
+        return totalOrders;
+    }
+    public void setRepeatPurchaseRate(BigDecimal repeatPurchaseRate) 
+    {
+        this.repeatPurchaseRate = repeatPurchaseRate;
+    }
+
+    public BigDecimal getRepeatPurchaseRate() 
+    {
+        return repeatPurchaseRate;
+    }
+    public void setTotalPayments(BigDecimal totalPayments) 
+    {
+        this.totalPayments = totalPayments;
+    }
+
+    public BigDecimal getTotalPayments() 
+    {
+        return totalPayments;
+    }
+    public void setTotalRefunds(BigDecimal totalRefunds) 
+    {
+        this.totalRefunds = totalRefunds;
+    }
+
+    public BigDecimal getTotalRefunds() 
+    {
+        return totalRefunds;
+    }
+    public void setOutstandingBalance(BigDecimal outstandingBalance) 
+    {
+        this.outstandingBalance = outstandingBalance;
+    }
+
+    public BigDecimal getOutstandingBalance() 
+    {
+        return outstandingBalance;
+    }
+    public void setStatisticPeriod(Date statisticPeriod) 
+    {
+        this.statisticPeriod = statisticPeriod;
+    }
+
+    public Date getStatisticPeriod() 
+    {
+        return statisticPeriod;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("customerName", getCustomerName())
+            .append("customerType", getCustomerType())
+            .append("contactName", getContactName())
+            .append("contactPhone", getContactPhone())
+            .append("region", getRegion())
+            .append("totalSales", getTotalSales())
+            .append("totalQuantity", getTotalQuantity())
+            .append("averageUnitPrice", getAverageUnitPrice())
+            .append("largestOrder", getLargestOrder())
+            .append("averageOrderValue", getAverageOrderValue())
+            .append("directSales", getDirectSales())
+            .append("agentSales", getAgentSales())
+            .append("onlineSales", getOnlineSales())
+            .append("gasSales", getGasSales())
+            .append("equipmentSales", getEquipmentSales())
+            .append("serviceSales", getServiceSales())
+            .append("firstOrderDate", getFirstOrderDate())
+            .append("lastOrderDate", getLastOrderDate())
+            .append("totalOrders", getTotalOrders())
+            .append("repeatPurchaseRate", getRepeatPurchaseRate())
+            .append("totalPayments", getTotalPayments())
+            .append("totalRefunds", getTotalRefunds())
+            .append("outstandingBalance", getOutstandingBalance())
+            .append("statisticPeriod", getStatisticPeriod())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/domain/HtJczcKucuntongji.java

@@ -0,0 +1,363 @@
+package com.ktg.mes.md.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.BaseEntity;
+
+/**
+ * 库存统计报对象 ht_jczc_kucuntongji
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public class HtJczcKucuntongji extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 统计日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "统计日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date statisticDate;
+
+    /** 总库存价值 */
+    @Excel(name = "总库存价值")
+    private BigDecimal totalInventoryValue;
+
+    /** 总库存数量 */
+    @Excel(name = "总库存数量")
+    private BigDecimal totalQuantity;
+
+    /** 原材料库存价值 */
+    @Excel(name = "原材料库存价值")
+    private BigDecimal rawMaterialValue;
+
+    /** 原材料库存数量 */
+    @Excel(name = "原材料库存数量")
+    private BigDecimal rawMaterialQuantity;
+
+    /** 原材料库存周转率 */
+    @Excel(name = "原材料库存周转率")
+    private BigDecimal rawMaterialTurnoverRate;
+
+    /** 成品库存价值 */
+    @Excel(name = "成品库存价值")
+    private BigDecimal finishedGoodsValue;
+
+    /** 成品库存数量 */
+    @Excel(name = "成品库存数量")
+    private BigDecimal finishedGoodsQuantity;
+
+    /** 成品库存周转率 */
+    @Excel(name = "成品库存周转率")
+    private BigDecimal finishedGoodsTurnoverRate;
+
+    /** 氧气库存价值 */
+    @Excel(name = "氧气库存价值")
+    private BigDecimal oxygenValue;
+
+    /** 氧气库存数量 */
+    @Excel(name = "氧气库存数量")
+    private BigDecimal oxygenQuantity;
+
+    /** 氮气库存价值 */
+    @Excel(name = "氮气库存价值")
+    private BigDecimal nitrogenValue;
+
+    /** 氮气库存数量 */
+    @Excel(name = "氮气库存数量")
+    private BigDecimal nitrogenQuantity;
+
+    /** 氩气库存价值 */
+    @Excel(name = "氩气库存价值")
+    private BigDecimal argonValue;
+
+    /** 氩气库存数量 */
+    @Excel(name = "氩气库存数量")
+    private BigDecimal argonQuantity;
+
+    /** 总库存周转率 */
+    @Excel(name = "总库存周转率")
+    private BigDecimal overallTurnoverRate;
+
+    /** 库存周转天数 */
+    @Excel(name = "库存周转天数")
+    private Integer daysInventoryOutstanding;
+
+    /** 低库存商品数量 */
+    @Excel(name = "低库存商品数量")
+    private Integer lowStockItems;
+
+    /** 缺货商品数量 */
+    @Excel(name = "缺货商品数量")
+    private Integer outOfStockItems;
+
+    /** 积压商品数量 */
+    @Excel(name = "积压商品数量")
+    private Integer excessStockItems;
+
+    /** 地区 */
+    @Excel(name = "地区")
+    private String region;
+
+    /** 仓库名称 */
+    @Excel(name = "仓库名称")
+    private String warehouse;
+
+    /** 年份 */
+    @Excel(name = "年份")
+    private Integer year;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setStatisticDate(Date statisticDate) 
+    {
+        this.statisticDate = statisticDate;
+    }
+
+    public Date getStatisticDate() 
+    {
+        return statisticDate;
+    }
+    public void setTotalInventoryValue(BigDecimal totalInventoryValue) 
+    {
+        this.totalInventoryValue = totalInventoryValue;
+    }
+
+    public BigDecimal getTotalInventoryValue() 
+    {
+        return totalInventoryValue;
+    }
+    public void setTotalQuantity(BigDecimal totalQuantity) 
+    {
+        this.totalQuantity = totalQuantity;
+    }
+
+    public BigDecimal getTotalQuantity() 
+    {
+        return totalQuantity;
+    }
+    public void setRawMaterialValue(BigDecimal rawMaterialValue) 
+    {
+        this.rawMaterialValue = rawMaterialValue;
+    }
+
+    public BigDecimal getRawMaterialValue() 
+    {
+        return rawMaterialValue;
+    }
+    public void setRawMaterialQuantity(BigDecimal rawMaterialQuantity) 
+    {
+        this.rawMaterialQuantity = rawMaterialQuantity;
+    }
+
+    public BigDecimal getRawMaterialQuantity() 
+    {
+        return rawMaterialQuantity;
+    }
+    public void setRawMaterialTurnoverRate(BigDecimal rawMaterialTurnoverRate) 
+    {
+        this.rawMaterialTurnoverRate = rawMaterialTurnoverRate;
+    }
+
+    public BigDecimal getRawMaterialTurnoverRate() 
+    {
+        return rawMaterialTurnoverRate;
+    }
+    public void setFinishedGoodsValue(BigDecimal finishedGoodsValue) 
+    {
+        this.finishedGoodsValue = finishedGoodsValue;
+    }
+
+    public BigDecimal getFinishedGoodsValue() 
+    {
+        return finishedGoodsValue;
+    }
+    public void setFinishedGoodsQuantity(BigDecimal finishedGoodsQuantity) 
+    {
+        this.finishedGoodsQuantity = finishedGoodsQuantity;
+    }
+
+    public BigDecimal getFinishedGoodsQuantity() 
+    {
+        return finishedGoodsQuantity;
+    }
+    public void setFinishedGoodsTurnoverRate(BigDecimal finishedGoodsTurnoverRate) 
+    {
+        this.finishedGoodsTurnoverRate = finishedGoodsTurnoverRate;
+    }
+
+    public BigDecimal getFinishedGoodsTurnoverRate() 
+    {
+        return finishedGoodsTurnoverRate;
+    }
+    public void setOxygenValue(BigDecimal oxygenValue) 
+    {
+        this.oxygenValue = oxygenValue;
+    }
+
+    public BigDecimal getOxygenValue() 
+    {
+        return oxygenValue;
+    }
+    public void setOxygenQuantity(BigDecimal oxygenQuantity) 
+    {
+        this.oxygenQuantity = oxygenQuantity;
+    }
+
+    public BigDecimal getOxygenQuantity() 
+    {
+        return oxygenQuantity;
+    }
+    public void setNitrogenValue(BigDecimal nitrogenValue) 
+    {
+        this.nitrogenValue = nitrogenValue;
+    }
+
+    public BigDecimal getNitrogenValue() 
+    {
+        return nitrogenValue;
+    }
+    public void setNitrogenQuantity(BigDecimal nitrogenQuantity) 
+    {
+        this.nitrogenQuantity = nitrogenQuantity;
+    }
+
+    public BigDecimal getNitrogenQuantity() 
+    {
+        return nitrogenQuantity;
+    }
+    public void setArgonValue(BigDecimal argonValue) 
+    {
+        this.argonValue = argonValue;
+    }
+
+    public BigDecimal getArgonValue() 
+    {
+        return argonValue;
+    }
+    public void setArgonQuantity(BigDecimal argonQuantity) 
+    {
+        this.argonQuantity = argonQuantity;
+    }
+
+    public BigDecimal getArgonQuantity() 
+    {
+        return argonQuantity;
+    }
+    public void setOverallTurnoverRate(BigDecimal overallTurnoverRate) 
+    {
+        this.overallTurnoverRate = overallTurnoverRate;
+    }
+
+    public BigDecimal getOverallTurnoverRate() 
+    {
+        return overallTurnoverRate;
+    }
+    public void setDaysInventoryOutstanding(Integer daysInventoryOutstanding) 
+    {
+        this.daysInventoryOutstanding = daysInventoryOutstanding;
+    }
+
+    public Integer getDaysInventoryOutstanding() 
+    {
+        return daysInventoryOutstanding;
+    }
+    public void setLowStockItems(Integer lowStockItems) 
+    {
+        this.lowStockItems = lowStockItems;
+    }
+
+    public Integer getLowStockItems() 
+    {
+        return lowStockItems;
+    }
+    public void setOutOfStockItems(Integer outOfStockItems) 
+    {
+        this.outOfStockItems = outOfStockItems;
+    }
+
+    public Integer getOutOfStockItems() 
+    {
+        return outOfStockItems;
+    }
+    public void setExcessStockItems(Integer excessStockItems) 
+    {
+        this.excessStockItems = excessStockItems;
+    }
+
+    public Integer getExcessStockItems() 
+    {
+        return excessStockItems;
+    }
+    public void setRegion(String region) 
+    {
+        this.region = region;
+    }
+
+    public String getRegion() 
+    {
+        return region;
+    }
+    public void setWarehouse(String warehouse) 
+    {
+        this.warehouse = warehouse;
+    }
+
+    public String getWarehouse() 
+    {
+        return warehouse;
+    }
+    public void setYear(Integer year) 
+    {
+        this.year = year;
+    }
+
+    public Integer getYear() 
+    {
+        return year;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("statisticDate", getStatisticDate())
+            .append("totalInventoryValue", getTotalInventoryValue())
+            .append("totalQuantity", getTotalQuantity())
+            .append("rawMaterialValue", getRawMaterialValue())
+            .append("rawMaterialQuantity", getRawMaterialQuantity())
+            .append("rawMaterialTurnoverRate", getRawMaterialTurnoverRate())
+            .append("finishedGoodsValue", getFinishedGoodsValue())
+            .append("finishedGoodsQuantity", getFinishedGoodsQuantity())
+            .append("finishedGoodsTurnoverRate", getFinishedGoodsTurnoverRate())
+            .append("oxygenValue", getOxygenValue())
+            .append("oxygenQuantity", getOxygenQuantity())
+            .append("nitrogenValue", getNitrogenValue())
+            .append("nitrogenQuantity", getNitrogenQuantity())
+            .append("argonValue", getArgonValue())
+            .append("argonQuantity", getArgonQuantity())
+            .append("overallTurnoverRate", getOverallTurnoverRate())
+            .append("daysInventoryOutstanding", getDaysInventoryOutstanding())
+            .append("lowStockItems", getLowStockItems())
+            .append("outOfStockItems", getOutOfStockItems())
+            .append("excessStockItems", getExcessStockItems())
+            .append("region", getRegion())
+            .append("warehouse", getWarehouse())
+            .append("year", getYear())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/domain/HtJczcQipingtongji.java

@@ -0,0 +1,334 @@
+package com.ktg.mes.md.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.BaseEntity;
+
+/**
+ * 气瓶统计报对象 ht_jczc_qipingtongji
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public class HtJczcQipingtongji extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 统计日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "统计日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date statisticDate;
+
+    /** 公司库存气瓶数量 */
+    @Excel(name = "公司库存气瓶数量")
+    private Integer companyStock;
+
+    /** 客户欠瓶数量 */
+    @Excel(name = "客户欠瓶数量")
+    private Integer customerOwing;
+
+    /** 新购气瓶数量 */
+    @Excel(name = "新购气瓶数量")
+    private Integer newlyPurchased;
+
+    /** 售出气瓶数量 */
+    @Excel(name = "售出气瓶数量")
+    private Integer sold;
+
+    /** 报废气瓶数量 */
+    @Excel(name = "报废气瓶数量")
+    private Integer scrapped;
+
+    /** 气瓶实际总量 */
+    @Excel(name = "气瓶实际总量")
+    private Integer totalCylinders;
+
+    /** 在库气瓶数量 */
+    @Excel(name = "在库气瓶数量")
+    private Integer inStock;
+
+    /** 在用气瓶数量 */
+    @Excel(name = "在用气瓶数量")
+    private Integer inUse;
+
+    /** 在维护气瓶数量 */
+    @Excel(name = "在维护气瓶数量")
+    private Integer inMaintenance;
+
+    /** 待报废气瓶数量 */
+    @Excel(name = "待报废气瓶数量")
+    private Integer awaitingScrap;
+
+    /** 氧气瓶数量 */
+    @Excel(name = "氧气瓶数量")
+    private Integer oxygenCylinders;
+
+    /** 氮气瓶数量 */
+    @Excel(name = "氮气瓶数量")
+    private Integer nitrogenCylinders;
+
+    /** 氩气瓶数量 */
+    @Excel(name = "氩气瓶数量")
+    private Integer argonCylinders;
+
+    /** 其他气瓶数量 */
+    @Excel(name = "其他气瓶数量")
+    private Integer otherCylinders;
+
+    /** 租出气瓶数量 */
+    @Excel(name = "租出气瓶数量")
+    private Integer cylindersRented;
+
+    /** 归还气瓶数量 */
+    @Excel(name = "归还气瓶数量")
+    private Integer cylindersReturned;
+
+    /** 丢失气瓶数量 */
+    @Excel(name = "丢失气瓶数量")
+    private Integer cylindersLost;
+
+    /** 地区 */
+    @Excel(name = "地区")
+    private String region;
+
+    /** 仓库名称 */
+    @Excel(name = "仓库名称")
+    private String warehouse;
+
+    /** 年份 */
+    @Excel(name = "年份")
+    private Integer year;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setStatisticDate(Date statisticDate) 
+    {
+        this.statisticDate = statisticDate;
+    }
+
+    public Date getStatisticDate() 
+    {
+        return statisticDate;
+    }
+    public void setCompanyStock(Integer companyStock) 
+    {
+        this.companyStock = companyStock;
+    }
+
+    public Integer getCompanyStock() 
+    {
+        return companyStock;
+    }
+    public void setCustomerOwing(Integer customerOwing) 
+    {
+        this.customerOwing = customerOwing;
+    }
+
+    public Integer getCustomerOwing() 
+    {
+        return customerOwing;
+    }
+    public void setNewlyPurchased(Integer newlyPurchased) 
+    {
+        this.newlyPurchased = newlyPurchased;
+    }
+
+    public Integer getNewlyPurchased() 
+    {
+        return newlyPurchased;
+    }
+    public void setSold(Integer sold) 
+    {
+        this.sold = sold;
+    }
+
+    public Integer getSold() 
+    {
+        return sold;
+    }
+    public void setScrapped(Integer scrapped) 
+    {
+        this.scrapped = scrapped;
+    }
+
+    public Integer getScrapped() 
+    {
+        return scrapped;
+    }
+    public void setTotalCylinders(Integer totalCylinders) 
+    {
+        this.totalCylinders = totalCylinders;
+    }
+
+    public Integer getTotalCylinders() 
+    {
+        return totalCylinders;
+    }
+    public void setInStock(Integer inStock) 
+    {
+        this.inStock = inStock;
+    }
+
+    public Integer getInStock() 
+    {
+        return inStock;
+    }
+    public void setInUse(Integer inUse) 
+    {
+        this.inUse = inUse;
+    }
+
+    public Integer getInUse() 
+    {
+        return inUse;
+    }
+    public void setInMaintenance(Integer inMaintenance) 
+    {
+        this.inMaintenance = inMaintenance;
+    }
+
+    public Integer getInMaintenance() 
+    {
+        return inMaintenance;
+    }
+    public void setAwaitingScrap(Integer awaitingScrap) 
+    {
+        this.awaitingScrap = awaitingScrap;
+    }
+
+    public Integer getAwaitingScrap() 
+    {
+        return awaitingScrap;
+    }
+    public void setOxygenCylinders(Integer oxygenCylinders) 
+    {
+        this.oxygenCylinders = oxygenCylinders;
+    }
+
+    public Integer getOxygenCylinders() 
+    {
+        return oxygenCylinders;
+    }
+    public void setNitrogenCylinders(Integer nitrogenCylinders) 
+    {
+        this.nitrogenCylinders = nitrogenCylinders;
+    }
+
+    public Integer getNitrogenCylinders() 
+    {
+        return nitrogenCylinders;
+    }
+    public void setArgonCylinders(Integer argonCylinders) 
+    {
+        this.argonCylinders = argonCylinders;
+    }
+
+    public Integer getArgonCylinders() 
+    {
+        return argonCylinders;
+    }
+    public void setOtherCylinders(Integer otherCylinders) 
+    {
+        this.otherCylinders = otherCylinders;
+    }
+
+    public Integer getOtherCylinders() 
+    {
+        return otherCylinders;
+    }
+    public void setCylindersRented(Integer cylindersRented) 
+    {
+        this.cylindersRented = cylindersRented;
+    }
+
+    public Integer getCylindersRented() 
+    {
+        return cylindersRented;
+    }
+    public void setCylindersReturned(Integer cylindersReturned) 
+    {
+        this.cylindersReturned = cylindersReturned;
+    }
+
+    public Integer getCylindersReturned() 
+    {
+        return cylindersReturned;
+    }
+    public void setCylindersLost(Integer cylindersLost) 
+    {
+        this.cylindersLost = cylindersLost;
+    }
+
+    public Integer getCylindersLost() 
+    {
+        return cylindersLost;
+    }
+    public void setRegion(String region) 
+    {
+        this.region = region;
+    }
+
+    public String getRegion() 
+    {
+        return region;
+    }
+    public void setWarehouse(String warehouse) 
+    {
+        this.warehouse = warehouse;
+    }
+
+    public String getWarehouse() 
+    {
+        return warehouse;
+    }
+    public void setYear(Integer year) 
+    {
+        this.year = year;
+    }
+
+    public Integer getYear() 
+    {
+        return year;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("statisticDate", getStatisticDate())
+            .append("companyStock", getCompanyStock())
+            .append("customerOwing", getCustomerOwing())
+            .append("newlyPurchased", getNewlyPurchased())
+            .append("sold", getSold())
+            .append("scrapped", getScrapped())
+            .append("totalCylinders", getTotalCylinders())
+            .append("inStock", getInStock())
+            .append("inUse", getInUse())
+            .append("inMaintenance", getInMaintenance())
+            .append("awaitingScrap", getAwaitingScrap())
+            .append("oxygenCylinders", getOxygenCylinders())
+            .append("nitrogenCylinders", getNitrogenCylinders())
+            .append("argonCylinders", getArgonCylinders())
+            .append("otherCylinders", getOtherCylinders())
+            .append("cylindersRented", getCylindersRented())
+            .append("cylindersReturned", getCylindersReturned())
+            .append("cylindersLost", getCylindersLost())
+            .append("region", getRegion())
+            .append("warehouse", getWarehouse())
+            .append("year", getYear())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/domain/HtJczcXiaoshoutongji.java

@@ -0,0 +1,348 @@
+package com.ktg.mes.md.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.BaseEntity;
+
+/**
+ * 销售统计报对象 ht_jczc_xiaoshoutongji
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public class HtJczcXiaoshoutongji extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 统计日期（通常是每月第一天） */
+    @Excel(name = "统计日期", readConverterExp = "通=常是每月第一天")
+    private Date statisticDate;
+
+    /** 总销售额 */
+    @Excel(name = "总销售额")
+    private BigDecimal totalSales;
+
+    /** 总销售量 */
+    @Excel(name = "总销售量")
+    private BigDecimal totalQuantity;
+
+    /** 平均单价 */
+    @Excel(name = "平均单价")
+    private BigDecimal averageUnitPrice;
+
+    /** 工业客户销售额 */
+    @Excel(name = "工业客户销售额")
+    private BigDecimal industrialSales;
+
+    /** 医疗客户销售额 */
+    @Excel(name = "医疗客户销售额")
+    private BigDecimal medicalSales;
+
+    /** 零售客户销售额 */
+    @Excel(name = "零售客户销售额")
+    private BigDecimal retailSales;
+
+    /** 其他客户销售额 */
+    @Excel(name = "其他客户销售额")
+    private BigDecimal otherSales;
+
+    /** 直销销售额 */
+    @Excel(name = "直销销售额")
+    private BigDecimal directSales;
+
+    /** 代理商销售额 */
+    @Excel(name = "代理商销售额")
+    private BigDecimal agentSales;
+
+    /** 电商平台销售额 */
+    @Excel(name = "电商平台销售额")
+    private BigDecimal onlineSales;
+
+    /** 气体产品销售额 */
+    @Excel(name = "气体产品销售额")
+    private BigDecimal gasSales;
+
+    /** 设备销售额 */
+    @Excel(name = "设备销售额")
+    private BigDecimal equipmentSales;
+
+    /** 服务销售额 */
+    @Excel(name = "服务销售额")
+    private BigDecimal serviceSales;
+
+    /** 新增客户数量 */
+    @Excel(name = "新增客户数量")
+    private Integer newCustomers;
+
+    /** 回头客数量 */
+    @Excel(name = "回头客数量")
+    private Integer repeatCustomers;
+
+    /** 最大订单金额 */
+    @Excel(name = "最大订单金额")
+    private BigDecimal largestOrder;
+
+    /** 平均订单金额 */
+    @Excel(name = "平均订单金额")
+    private BigDecimal averageOrderValue;
+
+    /** 退款金额 */
+    @Excel(name = "退款金额")
+    private BigDecimal refundAmount;
+
+    /** 净销售额 */
+    @Excel(name = "净销售额")
+    private BigDecimal netSales;
+
+    /** 季度 */
+    @Excel(name = "季度")
+    private String season;
+
+    /** 年份 */
+    @Excel(name = "年份")
+    private Integer year;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setStatisticDate(Date statisticDate) 
+    {
+        this.statisticDate = statisticDate;
+    }
+
+    public Date getStatisticDate() 
+    {
+        return statisticDate;
+    }
+    public void setTotalSales(BigDecimal totalSales) 
+    {
+        this.totalSales = totalSales;
+    }
+
+    public BigDecimal getTotalSales() 
+    {
+        return totalSales;
+    }
+    public void setTotalQuantity(BigDecimal totalQuantity) 
+    {
+        this.totalQuantity = totalQuantity;
+    }
+
+    public BigDecimal getTotalQuantity() 
+    {
+        return totalQuantity;
+    }
+    public void setAverageUnitPrice(BigDecimal averageUnitPrice) 
+    {
+        this.averageUnitPrice = averageUnitPrice;
+    }
+
+    public BigDecimal getAverageUnitPrice() 
+    {
+        return averageUnitPrice;
+    }
+    public void setIndustrialSales(BigDecimal industrialSales) 
+    {
+        this.industrialSales = industrialSales;
+    }
+
+    public BigDecimal getIndustrialSales() 
+    {
+        return industrialSales;
+    }
+    public void setMedicalSales(BigDecimal medicalSales) 
+    {
+        this.medicalSales = medicalSales;
+    }
+
+    public BigDecimal getMedicalSales() 
+    {
+        return medicalSales;
+    }
+    public void setRetailSales(BigDecimal retailSales) 
+    {
+        this.retailSales = retailSales;
+    }
+
+    public BigDecimal getRetailSales() 
+    {
+        return retailSales;
+    }
+    public void setOtherSales(BigDecimal otherSales) 
+    {
+        this.otherSales = otherSales;
+    }
+
+    public BigDecimal getOtherSales() 
+    {
+        return otherSales;
+    }
+    public void setDirectSales(BigDecimal directSales) 
+    {
+        this.directSales = directSales;
+    }
+
+    public BigDecimal getDirectSales() 
+    {
+        return directSales;
+    }
+    public void setAgentSales(BigDecimal agentSales) 
+    {
+        this.agentSales = agentSales;
+    }
+
+    public BigDecimal getAgentSales() 
+    {
+        return agentSales;
+    }
+    public void setOnlineSales(BigDecimal onlineSales) 
+    {
+        this.onlineSales = onlineSales;
+    }
+
+    public BigDecimal getOnlineSales() 
+    {
+        return onlineSales;
+    }
+    public void setGasSales(BigDecimal gasSales) 
+    {
+        this.gasSales = gasSales;
+    }
+
+    public BigDecimal getGasSales() 
+    {
+        return gasSales;
+    }
+    public void setEquipmentSales(BigDecimal equipmentSales) 
+    {
+        this.equipmentSales = equipmentSales;
+    }
+
+    public BigDecimal getEquipmentSales() 
+    {
+        return equipmentSales;
+    }
+    public void setServiceSales(BigDecimal serviceSales) 
+    {
+        this.serviceSales = serviceSales;
+    }
+
+    public BigDecimal getServiceSales() 
+    {
+        return serviceSales;
+    }
+    public void setNewCustomers(Integer newCustomers) 
+    {
+        this.newCustomers = newCustomers;
+    }
+
+    public Integer getNewCustomers() 
+    {
+        return newCustomers;
+    }
+    public void setRepeatCustomers(Integer repeatCustomers) 
+    {
+        this.repeatCustomers = repeatCustomers;
+    }
+
+    public Integer getRepeatCustomers() 
+    {
+        return repeatCustomers;
+    }
+    public void setLargestOrder(BigDecimal largestOrder) 
+    {
+        this.largestOrder = largestOrder;
+    }
+
+    public BigDecimal getLargestOrder() 
+    {
+        return largestOrder;
+    }
+    public void setAverageOrderValue(BigDecimal averageOrderValue) 
+    {
+        this.averageOrderValue = averageOrderValue;
+    }
+
+    public BigDecimal getAverageOrderValue() 
+    {
+        return averageOrderValue;
+    }
+    public void setRefundAmount(BigDecimal refundAmount) 
+    {
+        this.refundAmount = refundAmount;
+    }
+
+    public BigDecimal getRefundAmount() 
+    {
+        return refundAmount;
+    }
+    public void setNetSales(BigDecimal netSales) 
+    {
+        this.netSales = netSales;
+    }
+
+    public BigDecimal getNetSales() 
+    {
+        return netSales;
+    }
+    public void setSeason(String season) 
+    {
+        this.season = season;
+    }
+
+    public String getSeason() 
+    {
+        return season;
+    }
+    public void setYear(Integer year) 
+    {
+        this.year = year;
+    }
+
+    public Integer getYear() 
+    {
+        return year;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("statisticDate", getStatisticDate())
+            .append("totalSales", getTotalSales())
+            .append("totalQuantity", getTotalQuantity())
+            .append("averageUnitPrice", getAverageUnitPrice())
+            .append("industrialSales", getIndustrialSales())
+            .append("medicalSales", getMedicalSales())
+            .append("retailSales", getRetailSales())
+            .append("otherSales", getOtherSales())
+            .append("directSales", getDirectSales())
+            .append("agentSales", getAgentSales())
+            .append("onlineSales", getOnlineSales())
+            .append("gasSales", getGasSales())
+            .append("equipmentSales", getEquipmentSales())
+            .append("serviceSales", getServiceSales())
+            .append("newCustomers", getNewCustomers())
+            .append("repeatCustomers", getRepeatCustomers())
+            .append("largestOrder", getLargestOrder())
+            .append("averageOrderValue", getAverageOrderValue())
+            .append("refundAmount", getRefundAmount())
+            .append("netSales", getNetSales())
+            .append("season", getSeason())
+            .append("year", getYear())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/domain/HtQingjia.java

@@ -0,0 +1,97 @@
+package com.ktg.mes.md.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.BaseEntity;
+
+/**
+ * 请假对象 ht_qingjia
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+public class HtQingjia extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Integer id;
+
+    /** 类型 */
+    @Excel(name = "类型")
+    private String leixing;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date kaishi;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date jieshu;
+
+    /** 原因 */
+    @Excel(name = "原因")
+    private String yuanyin;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setLeixing(String leixing) 
+    {
+        this.leixing = leixing;
+    }
+
+    public String getLeixing() 
+    {
+        return leixing;
+    }
+    public void setKaishi(Date kaishi) 
+    {
+        this.kaishi = kaishi;
+    }
+
+    public Date getKaishi() 
+    {
+        return kaishi;
+    }
+    public void setJieshu(Date jieshu) 
+    {
+        this.jieshu = jieshu;
+    }
+
+    public Date getJieshu() 
+    {
+        return jieshu;
+    }
+    public void setYuanyin(String yuanyin) 
+    {
+        this.yuanyin = yuanyin;
+    }
+
+    public String getYuanyin() 
+    {
+        return yuanyin;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("leixing", getLeixing())
+            .append("kaishi", getKaishi())
+            .append("jieshu", getJieshu())
+            .append("yuanyin", getYuanyin())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/domain/HtWeipan.java

@@ -0,0 +1,96 @@
+package com.ktg.mes.md.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.BaseEntity;
+
+/**
+ * 微盘管理对象 ht_weipan
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+public class HtWeipan extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 上传人 */
+    @Excel(name = "上传人")
+    private String shangchuanren;
+
+    /** 时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date shijian;
+
+    /** 类型 */
+    @Excel(name = "类型")
+    private String leixing;
+
+    /** 文件 */
+    @Excel(name = "文件")
+    private String wenjian;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setShangchuanren(String shangchuanren) 
+    {
+        this.shangchuanren = shangchuanren;
+    }
+
+    public String getShangchuanren() 
+    {
+        return shangchuanren;
+    }
+    public void setShijian(Date shijian) 
+    {
+        this.shijian = shijian;
+    }
+
+    public Date getShijian() 
+    {
+        return shijian;
+    }
+    public void setLeixing(String leixing) 
+    {
+        this.leixing = leixing;
+    }
+
+    public String getLeixing() 
+    {
+        return leixing;
+    }
+    public void setWenjian(String wenjian) 
+    {
+        this.wenjian = wenjian;
+    }
+
+    public String getWenjian() 
+    {
+        return wenjian;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("shangchuanren", getShangchuanren())
+            .append("shijian", getShijian())
+            .append("leixing", getLeixing())
+            .append("wenjian", getWenjian())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/domain/HtZhiliangfenxi.java

@@ -0,0 +1,334 @@
+package com.ktg.mes.md.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.BaseEntity;
+
+/**
+ * 数据统计与分析对象 ht_zhiliangfenxi
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public class HtZhiliangfenxi extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 统计日期（通常是每天或每月第一天） */
+    @Excel(name = "统计日期", readConverterExp = "通=常是每天或每月第一天")
+    private Date statisticDate;
+
+    /** 总检测样本数 */
+    @Excel(name = "总检测样本数")
+    private Integer totalSamples;
+
+    /** 合格样本数 */
+    @Excel(name = "合格样本数")
+    private Integer passedSamples;
+
+    /** 不合格样本数 */
+    @Excel(name = "不合格样本数")
+    private Integer failedSamples;
+
+    /** 合格率 */
+    @Excel(name = "合格率")
+    private BigDecimal passRate;
+
+    /** 杂质超标不合格数 */
+    @Excel(name = "杂质超标不合格数")
+    private Integer impurityFailures;
+
+    /** 压力不合格数 */
+    @Excel(name = "压力不合格数")
+    private Integer pressureFailures;
+
+    /** 泄漏不合格数 */
+    @Excel(name = "泄漏不合格数")
+    private Integer leakageFailures;
+
+    /** 标签错误不合格数 */
+    @Excel(name = "标签错误不合格数")
+    private Integer labelingFailures;
+
+    /** 其他原因不合格数 */
+    @Excel(name = "其他原因不合格数")
+    private Integer otherFailures;
+
+    /** 氧气产品合格率 */
+    @Excel(name = "氧气产品合格率")
+    private BigDecimal oxygenPassRate;
+
+    /** 氮气产品合格率 */
+    @Excel(name = "氮气产品合格率")
+    private BigDecimal nitrogenPassRate;
+
+    /** 氩气产品合格率 */
+    @Excel(name = "氩气产品合格率")
+    private BigDecimal argonPassRate;
+
+    /** 其他气体产品合格率 */
+    @Excel(name = "其他气体产品合格率")
+    private BigDecimal otherGasesPassRate;
+
+    /** 检测设备名称 */
+    @Excel(name = "检测设备名称")
+    private String testingEquipment;
+
+    /** 检测人员姓名 */
+    @Excel(name = "检测人员姓名")
+    private String testingPersonnel;
+
+    /** 地区 */
+    @Excel(name = "地区")
+    private String region;
+
+    /** 生产线名称 */
+    @Excel(name = "生产线名称")
+    private String productionLine;
+
+    /** 年份 */
+    @Excel(name = "年份")
+    private Integer year;
+
+    /** 纠正措施 */
+    @Excel(name = "纠正措施")
+    private String correctiveActions;
+
+    /** 预防措施 */
+    @Excel(name = "预防措施")
+    private String preventiveActions;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setStatisticDate(Date statisticDate) 
+    {
+        this.statisticDate = statisticDate;
+    }
+
+    public Date getStatisticDate() 
+    {
+        return statisticDate;
+    }
+    public void setTotalSamples(Integer totalSamples) 
+    {
+        this.totalSamples = totalSamples;
+    }
+
+    public Integer getTotalSamples() 
+    {
+        return totalSamples;
+    }
+    public void setPassedSamples(Integer passedSamples) 
+    {
+        this.passedSamples = passedSamples;
+    }
+
+    public Integer getPassedSamples() 
+    {
+        return passedSamples;
+    }
+    public void setFailedSamples(Integer failedSamples) 
+    {
+        this.failedSamples = failedSamples;
+    }
+
+    public Integer getFailedSamples() 
+    {
+        return failedSamples;
+    }
+    public void setPassRate(BigDecimal passRate) 
+    {
+        this.passRate = passRate;
+    }
+
+    public BigDecimal getPassRate() 
+    {
+        return passRate;
+    }
+    public void setImpurityFailures(Integer impurityFailures) 
+    {
+        this.impurityFailures = impurityFailures;
+    }
+
+    public Integer getImpurityFailures() 
+    {
+        return impurityFailures;
+    }
+    public void setPressureFailures(Integer pressureFailures) 
+    {
+        this.pressureFailures = pressureFailures;
+    }
+
+    public Integer getPressureFailures() 
+    {
+        return pressureFailures;
+    }
+    public void setLeakageFailures(Integer leakageFailures) 
+    {
+        this.leakageFailures = leakageFailures;
+    }
+
+    public Integer getLeakageFailures() 
+    {
+        return leakageFailures;
+    }
+    public void setLabelingFailures(Integer labelingFailures) 
+    {
+        this.labelingFailures = labelingFailures;
+    }
+
+    public Integer getLabelingFailures() 
+    {
+        return labelingFailures;
+    }
+    public void setOtherFailures(Integer otherFailures) 
+    {
+        this.otherFailures = otherFailures;
+    }
+
+    public Integer getOtherFailures() 
+    {
+        return otherFailures;
+    }
+    public void setOxygenPassRate(BigDecimal oxygenPassRate) 
+    {
+        this.oxygenPassRate = oxygenPassRate;
+    }
+
+    public BigDecimal getOxygenPassRate() 
+    {
+        return oxygenPassRate;
+    }
+    public void setNitrogenPassRate(BigDecimal nitrogenPassRate) 
+    {
+        this.nitrogenPassRate = nitrogenPassRate;
+    }
+
+    public BigDecimal getNitrogenPassRate() 
+    {
+        return nitrogenPassRate;
+    }
+    public void setArgonPassRate(BigDecimal argonPassRate) 
+    {
+        this.argonPassRate = argonPassRate;
+    }
+
+    public BigDecimal getArgonPassRate() 
+    {
+        return argonPassRate;
+    }
+    public void setOtherGasesPassRate(BigDecimal otherGasesPassRate) 
+    {
+        this.otherGasesPassRate = otherGasesPassRate;
+    }
+
+    public BigDecimal getOtherGasesPassRate() 
+    {
+        return otherGasesPassRate;
+    }
+    public void setTestingEquipment(String testingEquipment) 
+    {
+        this.testingEquipment = testingEquipment;
+    }
+
+    public String getTestingEquipment() 
+    {
+        return testingEquipment;
+    }
+    public void setTestingPersonnel(String testingPersonnel) 
+    {
+        this.testingPersonnel = testingPersonnel;
+    }
+
+    public String getTestingPersonnel() 
+    {
+        return testingPersonnel;
+    }
+    public void setRegion(String region) 
+    {
+        this.region = region;
+    }
+
+    public String getRegion() 
+    {
+        return region;
+    }
+    public void setProductionLine(String productionLine) 
+    {
+        this.productionLine = productionLine;
+    }
+
+    public String getProductionLine() 
+    {
+        return productionLine;
+    }
+    public void setYear(Integer year) 
+    {
+        this.year = year;
+    }
+
+    public Integer getYear() 
+    {
+        return year;
+    }
+    public void setCorrectiveActions(String correctiveActions) 
+    {
+        this.correctiveActions = correctiveActions;
+    }
+
+    public String getCorrectiveActions() 
+    {
+        return correctiveActions;
+    }
+    public void setPreventiveActions(String preventiveActions) 
+    {
+        this.preventiveActions = preventiveActions;
+    }
+
+    public String getPreventiveActions() 
+    {
+        return preventiveActions;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("statisticDate", getStatisticDate())
+            .append("totalSamples", getTotalSamples())
+            .append("passedSamples", getPassedSamples())
+            .append("failedSamples", getFailedSamples())
+            .append("passRate", getPassRate())
+            .append("impurityFailures", getImpurityFailures())
+            .append("pressureFailures", getPressureFailures())
+            .append("leakageFailures", getLeakageFailures())
+            .append("labelingFailures", getLabelingFailures())
+            .append("otherFailures", getOtherFailures())
+            .append("oxygenPassRate", getOxygenPassRate())
+            .append("nitrogenPassRate", getNitrogenPassRate())
+            .append("argonPassRate", getArgonPassRate())
+            .append("otherGasesPassRate", getOtherGasesPassRate())
+            .append("testingEquipment", getTestingEquipment())
+            .append("testingPersonnel", getTestingPersonnel())
+            .append("region", getRegion())
+            .append("productionLine", getProductionLine())
+            .append("year", getYear())
+            .append("correctiveActions", getCorrectiveActions())
+            .append("preventiveActions", getPreventiveActions())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/domain/MdProductBom.java

@@ -43,6 +43,9 @@ public class MdProductBom extends BaseEntity
     @Excel(name = "BOM物料单位")
     private String unitOfMeasure;
 
+    /** BOM物料单位名称 */
+    private String unitName;
+
     /** 产品物料标识 */
     @Excel(name = "产品物料标识")
     private String itemOrProduct;
@@ -67,7 +70,15 @@ public class MdProductBom extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setBomId(Long bomId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setBomId(Long bomId)
     {
         this.bomId = bomId;
     }
@@ -204,6 +215,7 @@ public class MdProductBom extends BaseEntity
             .append("bomItemName", getBomItemName())
             .append("bomItemSpec", getBomItemSpec())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("itemOrProduct", getItemOrProduct())
             .append("quantity", getQuantity())
             .append("enableFlag", getEnableFlag())

ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkshop.java

@@ -35,6 +35,9 @@ public class MdWorkshop extends BaseEntity
     @Excel(name = "负责人")
     private String charge;
 
+    /** 负责人id */
+    private Long chargeId;
+
     /** 是否启用 */
     @Excel(name = "是否启用")
     private String enableFlag;
@@ -51,7 +54,15 @@ public class MdWorkshop extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setWorkshopId(Long workshopId) 
+    public Long getChargeId() {
+        return chargeId;
+    }
+
+    public void setChargeId(Long chargeId) {
+        this.chargeId = chargeId;
+    }
+
+    public void setWorkshopId(Long workshopId)
     {
         this.workshopId = workshopId;
     }
@@ -150,6 +161,7 @@ public class MdWorkshop extends BaseEntity
             .append("workshopName", getWorkshopName())
             .append("area", getArea())
             .append("charge", getCharge())
+            .append("chargeId", getChargeId())
             .append("enableFlag", getEnableFlag())
             .append("remark", getRemark())
             .append("attr1", getAttr1())

ktg-mes/src/main/java/com/ktg/mes/md/mapper/HtBaoxiaoMapper.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.mapper;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtBaoxiao;
+
+/**
+ * 报销Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+public interface HtBaoxiaoMapper 
+{
+    /**
+     * 查询报销
+     * 
+     * @param id 报销主键
+     * @return 报销
+     */
+    public HtBaoxiao selectHtBaoxiaoById(Integer id);
+
+    /**
+     * 查询报销列表
+     * 
+     * @param htBaoxiao 报销
+     * @return 报销集合
+     */
+    public List<HtBaoxiao> selectHtBaoxiaoList(HtBaoxiao htBaoxiao);
+
+    /**
+     * 新增报销
+     * 
+     * @param htBaoxiao 报销
+     * @return 结果
+     */
+    public int insertHtBaoxiao(HtBaoxiao htBaoxiao);
+
+    /**
+     * 修改报销
+     * 
+     * @param htBaoxiao 报销
+     * @return 结果
+     */
+    public int updateHtBaoxiao(HtBaoxiao htBaoxiao);
+
+    /**
+     * 删除报销
+     * 
+     * @param id 报销主键
+     * @return 结果
+     */
+    public int deleteHtBaoxiaoById(Integer id);
+
+    /**
+     * 批量删除报销
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteHtBaoxiaoByIds(Integer[] ids);
+}

ktg-mes/src/main/java/com/ktg/mes/md/mapper/HtGglMapper.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.mapper;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtGgl;
+
+/**
+ * 公告栏Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+public interface HtGglMapper 
+{
+    /**
+     * 查询公告栏
+     * 
+     * @param id 公告栏主键
+     * @return 公告栏
+     */
+    public HtGgl selectHtGglById(Integer id);
+
+    /**
+     * 查询公告栏列表
+     * 
+     * @param htGgl 公告栏
+     * @return 公告栏集合
+     */
+    public List<HtGgl> selectHtGglList(HtGgl htGgl);
+
+    /**
+     * 新增公告栏
+     * 
+     * @param htGgl 公告栏
+     * @return 结果
+     */
+    public int insertHtGgl(HtGgl htGgl);
+
+    /**
+     * 修改公告栏
+     * 
+     * @param htGgl 公告栏
+     * @return 结果
+     */
+    public int updateHtGgl(HtGgl htGgl);
+
+    /**
+     * 删除公告栏
+     * 
+     * @param id 公告栏主键
+     * @return 结果
+     */
+    public int deleteHtGglById(Integer id);
+
+    /**
+     * 批量删除公告栏
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteHtGglByIds(Integer[] ids);
+}

ktg-mes/src/main/java/com/ktg/mes/md/mapper/HtHetongMapper.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.mapper;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtHetong;
+
+/**
+ * 合同管理Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+public interface HtHetongMapper 
+{
+    /**
+     * 查询合同管理
+     * 
+     * @param id 合同管理主键
+     * @return 合同管理
+     */
+    public HtHetong selectHtHetongById(Integer id);
+
+    /**
+     * 查询合同管理列表
+     * 
+     * @param htHetong 合同管理
+     * @return 合同管理集合
+     */
+    public List<HtHetong> selectHtHetongList(HtHetong htHetong);
+
+    /**
+     * 新增合同管理
+     * 
+     * @param htHetong 合同管理
+     * @return 结果
+     */
+    public int insertHtHetong(HtHetong htHetong);
+
+    /**
+     * 修改合同管理
+     * 
+     * @param htHetong 合同管理
+     * @return 结果
+     */
+    public int updateHtHetong(HtHetong htHetong);
+
+    /**
+     * 删除合同管理
+     * 
+     * @param id 合同管理主键
+     * @return 结果
+     */
+    public int deleteHtHetongById(Integer id);
+
+    /**
+     * 批量删除合同管理
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteHtHetongByIds(Integer[] ids);
+}

ktg-mes/src/main/java/com/ktg/mes/md/mapper/HtJczcKehutongjiMapper.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.mapper;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtJczcKehutongji;
+
+/**
+ * 客户统计报Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface HtJczcKehutongjiMapper 
+{
+    /**
+     * 查询客户统计报
+     * 
+     * @param id 客户统计报主键
+     * @return 客户统计报
+     */
+    public HtJczcKehutongji selectHtJczcKehutongjiById(Integer id);
+
+    /**
+     * 查询客户统计报列表
+     * 
+     * @param htJczcKehutongji 客户统计报
+     * @return 客户统计报集合
+     */
+    public List<HtJczcKehutongji> selectHtJczcKehutongjiList(HtJczcKehutongji htJczcKehutongji);
+
+    /**
+     * 新增客户统计报
+     * 
+     * @param htJczcKehutongji 客户统计报
+     * @return 结果
+     */
+    public int insertHtJczcKehutongji(HtJczcKehutongji htJczcKehutongji);
+
+    /**
+     * 修改客户统计报
+     * 
+     * @param htJczcKehutongji 客户统计报
+     * @return 结果
+     */
+    public int updateHtJczcKehutongji(HtJczcKehutongji htJczcKehutongji);
+
+    /**
+     * 删除客户统计报
+     * 
+     * @param id 客户统计报主键
+     * @return 结果
+     */
+    public int deleteHtJczcKehutongjiById(Integer id);
+
+    /**
+     * 批量删除客户统计报
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteHtJczcKehutongjiByIds(Integer[] ids);
+}

ktg-mes/src/main/java/com/ktg/mes/md/mapper/HtJczcKucuntongjiMapper.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.mapper;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtJczcKucuntongji;
+
+/**
+ * 库存统计报Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface HtJczcKucuntongjiMapper 
+{
+    /**
+     * 查询库存统计报
+     * 
+     * @param id 库存统计报主键
+     * @return 库存统计报
+     */
+    public HtJczcKucuntongji selectHtJczcKucuntongjiById(Integer id);
+
+    /**
+     * 查询库存统计报列表
+     * 
+     * @param htJczcKucuntongji 库存统计报
+     * @return 库存统计报集合
+     */
+    public List<HtJczcKucuntongji> selectHtJczcKucuntongjiList(HtJczcKucuntongji htJczcKucuntongji);
+
+    /**
+     * 新增库存统计报
+     * 
+     * @param htJczcKucuntongji 库存统计报
+     * @return 结果
+     */
+    public int insertHtJczcKucuntongji(HtJczcKucuntongji htJczcKucuntongji);
+
+    /**
+     * 修改库存统计报
+     * 
+     * @param htJczcKucuntongji 库存统计报
+     * @return 结果
+     */
+    public int updateHtJczcKucuntongji(HtJczcKucuntongji htJczcKucuntongji);
+
+    /**
+     * 删除库存统计报
+     * 
+     * @param id 库存统计报主键
+     * @return 结果
+     */
+    public int deleteHtJczcKucuntongjiById(Integer id);
+
+    /**
+     * 批量删除库存统计报
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteHtJczcKucuntongjiByIds(Integer[] ids);
+}

ktg-mes/src/main/java/com/ktg/mes/md/mapper/HtJczcQipingtongjiMapper.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.mapper;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtJczcQipingtongji;
+
+/**
+ * 气瓶统计报Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface HtJczcQipingtongjiMapper 
+{
+    /**
+     * 查询气瓶统计报
+     * 
+     * @param id 气瓶统计报主键
+     * @return 气瓶统计报
+     */
+    public HtJczcQipingtongji selectHtJczcQipingtongjiById(Integer id);
+
+    /**
+     * 查询气瓶统计报列表
+     * 
+     * @param htJczcQipingtongji 气瓶统计报
+     * @return 气瓶统计报集合
+     */
+    public List<HtJczcQipingtongji> selectHtJczcQipingtongjiList(HtJczcQipingtongji htJczcQipingtongji);
+
+    /**
+     * 新增气瓶统计报
+     * 
+     * @param htJczcQipingtongji 气瓶统计报
+     * @return 结果
+     */
+    public int insertHtJczcQipingtongji(HtJczcQipingtongji htJczcQipingtongji);
+
+    /**
+     * 修改气瓶统计报
+     * 
+     * @param htJczcQipingtongji 气瓶统计报
+     * @return 结果
+     */
+    public int updateHtJczcQipingtongji(HtJczcQipingtongji htJczcQipingtongji);
+
+    /**
+     * 删除气瓶统计报
+     * 
+     * @param id 气瓶统计报主键
+     * @return 结果
+     */
+    public int deleteHtJczcQipingtongjiById(Integer id);
+
+    /**
+     * 批量删除气瓶统计报
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteHtJczcQipingtongjiByIds(Integer[] ids);
+}

ktg-mes/src/main/java/com/ktg/mes/md/mapper/HtJczcXiaoshoutongjiMapper.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.mapper;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtJczcXiaoshoutongji;
+
+/**
+ * 销售统计报Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface HtJczcXiaoshoutongjiMapper 
+{
+    /**
+     * 查询销售统计报
+     * 
+     * @param id 销售统计报主键
+     * @return 销售统计报
+     */
+    public HtJczcXiaoshoutongji selectHtJczcXiaoshoutongjiById(Integer id);
+
+    /**
+     * 查询销售统计报列表
+     * 
+     * @param htJczcXiaoshoutongji 销售统计报
+     * @return 销售统计报集合
+     */
+    public List<HtJczcXiaoshoutongji> selectHtJczcXiaoshoutongjiList(HtJczcXiaoshoutongji htJczcXiaoshoutongji);
+
+    /**
+     * 新增销售统计报
+     * 
+     * @param htJczcXiaoshoutongji 销售统计报
+     * @return 结果
+     */
+    public int insertHtJczcXiaoshoutongji(HtJczcXiaoshoutongji htJczcXiaoshoutongji);
+
+    /**
+     * 修改销售统计报
+     * 
+     * @param htJczcXiaoshoutongji 销售统计报
+     * @return 结果
+     */
+    public int updateHtJczcXiaoshoutongji(HtJczcXiaoshoutongji htJczcXiaoshoutongji);
+
+    /**
+     * 删除销售统计报
+     * 
+     * @param id 销售统计报主键
+     * @return 结果
+     */
+    public int deleteHtJczcXiaoshoutongjiById(Integer id);
+
+    /**
+     * 批量删除销售统计报
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteHtJczcXiaoshoutongjiByIds(Integer[] ids);
+}

ktg-mes/src/main/java/com/ktg/mes/md/mapper/HtQingjiaMapper.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.mapper;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtQingjia;
+
+/**
+ * 请假Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+public interface HtQingjiaMapper 
+{
+    /**
+     * 查询请假
+     * 
+     * @param id 请假主键
+     * @return 请假
+     */
+    public HtQingjia selectHtQingjiaById(Integer id);
+
+    /**
+     * 查询请假列表
+     * 
+     * @param htQingjia 请假
+     * @return 请假集合
+     */
+    public List<HtQingjia> selectHtQingjiaList(HtQingjia htQingjia);
+
+    /**
+     * 新增请假
+     * 
+     * @param htQingjia 请假
+     * @return 结果
+     */
+    public int insertHtQingjia(HtQingjia htQingjia);
+
+    /**
+     * 修改请假
+     * 
+     * @param htQingjia 请假
+     * @return 结果
+     */
+    public int updateHtQingjia(HtQingjia htQingjia);
+
+    /**
+     * 删除请假
+     * 
+     * @param id 请假主键
+     * @return 结果
+     */
+    public int deleteHtQingjiaById(Integer id);
+
+    /**
+     * 批量删除请假
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteHtQingjiaByIds(Integer[] ids);
+}

ktg-mes/src/main/java/com/ktg/mes/md/mapper/HtWeipanMapper.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.mapper;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtWeipan;
+
+/**
+ * 微盘管理Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+public interface HtWeipanMapper 
+{
+    /**
+     * 查询微盘管理
+     * 
+     * @param id 微盘管理主键
+     * @return 微盘管理
+     */
+    public HtWeipan selectHtWeipanById(Long id);
+
+    /**
+     * 查询微盘管理列表
+     * 
+     * @param htWeipan 微盘管理
+     * @return 微盘管理集合
+     */
+    public List<HtWeipan> selectHtWeipanList(HtWeipan htWeipan);
+
+    /**
+     * 新增微盘管理
+     * 
+     * @param htWeipan 微盘管理
+     * @return 结果
+     */
+    public int insertHtWeipan(HtWeipan htWeipan);
+
+    /**
+     * 修改微盘管理
+     * 
+     * @param htWeipan 微盘管理
+     * @return 结果
+     */
+    public int updateHtWeipan(HtWeipan htWeipan);
+
+    /**
+     * 删除微盘管理
+     * 
+     * @param id 微盘管理主键
+     * @return 结果
+     */
+    public int deleteHtWeipanById(Long id);
+
+    /**
+     * 批量删除微盘管理
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteHtWeipanByIds(Long[] ids);
+}

ktg-mes/src/main/java/com/ktg/mes/md/mapper/HtZhiliangfenxiMapper.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.mapper;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtZhiliangfenxi;
+
+/**
+ * 数据统计与分析Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface HtZhiliangfenxiMapper 
+{
+    /**
+     * 查询数据统计与分析
+     * 
+     * @param id 数据统计与分析主键
+     * @return 数据统计与分析
+     */
+    public HtZhiliangfenxi selectHtZhiliangfenxiById(Integer id);
+
+    /**
+     * 查询数据统计与分析列表
+     * 
+     * @param htZhiliangfenxi 数据统计与分析
+     * @return 数据统计与分析集合
+     */
+    public List<HtZhiliangfenxi> selectHtZhiliangfenxiList(HtZhiliangfenxi htZhiliangfenxi);
+
+    /**
+     * 新增数据统计与分析
+     * 
+     * @param htZhiliangfenxi 数据统计与分析
+     * @return 结果
+     */
+    public int insertHtZhiliangfenxi(HtZhiliangfenxi htZhiliangfenxi);
+
+    /**
+     * 修改数据统计与分析
+     * 
+     * @param htZhiliangfenxi 数据统计与分析
+     * @return 结果
+     */
+    public int updateHtZhiliangfenxi(HtZhiliangfenxi htZhiliangfenxi);
+
+    /**
+     * 删除数据统计与分析
+     * 
+     * @param id 数据统计与分析主键
+     * @return 结果
+     */
+    public int deleteHtZhiliangfenxiById(Integer id);
+
+    /**
+     * 批量删除数据统计与分析
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteHtZhiliangfenxiByIds(Integer[] ids);
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/IHtBaoxiaoService.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.service;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtBaoxiao;
+
+/**
+ * 报销Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+public interface IHtBaoxiaoService 
+{
+    /**
+     * 查询报销
+     * 
+     * @param id 报销主键
+     * @return 报销
+     */
+    public HtBaoxiao selectHtBaoxiaoById(Integer id);
+
+    /**
+     * 查询报销列表
+     * 
+     * @param htBaoxiao 报销
+     * @return 报销集合
+     */
+    public List<HtBaoxiao> selectHtBaoxiaoList(HtBaoxiao htBaoxiao);
+
+    /**
+     * 新增报销
+     * 
+     * @param htBaoxiao 报销
+     * @return 结果
+     */
+    public int insertHtBaoxiao(HtBaoxiao htBaoxiao);
+
+    /**
+     * 修改报销
+     * 
+     * @param htBaoxiao 报销
+     * @return 结果
+     */
+    public int updateHtBaoxiao(HtBaoxiao htBaoxiao);
+
+    /**
+     * 批量删除报销
+     * 
+     * @param ids 需要删除的报销主键集合
+     * @return 结果
+     */
+    public int deleteHtBaoxiaoByIds(Integer[] ids);
+
+    /**
+     * 删除报销信息
+     * 
+     * @param id 报销主键
+     * @return 结果
+     */
+    public int deleteHtBaoxiaoById(Integer id);
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/IHtGglService.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.service;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtGgl;
+
+/**
+ * 公告栏Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+public interface IHtGglService 
+{
+    /**
+     * 查询公告栏
+     * 
+     * @param id 公告栏主键
+     * @return 公告栏
+     */
+    public HtGgl selectHtGglById(Integer id);
+
+    /**
+     * 查询公告栏列表
+     * 
+     * @param htGgl 公告栏
+     * @return 公告栏集合
+     */
+    public List<HtGgl> selectHtGglList(HtGgl htGgl);
+
+    /**
+     * 新增公告栏
+     * 
+     * @param htGgl 公告栏
+     * @return 结果
+     */
+    public int insertHtGgl(HtGgl htGgl);
+
+    /**
+     * 修改公告栏
+     * 
+     * @param htGgl 公告栏
+     * @return 结果
+     */
+    public int updateHtGgl(HtGgl htGgl);
+
+    /**
+     * 批量删除公告栏
+     * 
+     * @param ids 需要删除的公告栏主键集合
+     * @return 结果
+     */
+    public int deleteHtGglByIds(Integer[] ids);
+
+    /**
+     * 删除公告栏信息
+     * 
+     * @param id 公告栏主键
+     * @return 结果
+     */
+    public int deleteHtGglById(Integer id);
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/IHtHetongService.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.service;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtHetong;
+
+/**
+ * 合同管理Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+public interface IHtHetongService 
+{
+    /**
+     * 查询合同管理
+     * 
+     * @param id 合同管理主键
+     * @return 合同管理
+     */
+    public HtHetong selectHtHetongById(Integer id);
+
+    /**
+     * 查询合同管理列表
+     * 
+     * @param htHetong 合同管理
+     * @return 合同管理集合
+     */
+    public List<HtHetong> selectHtHetongList(HtHetong htHetong);
+
+    /**
+     * 新增合同管理
+     * 
+     * @param htHetong 合同管理
+     * @return 结果
+     */
+    public int insertHtHetong(HtHetong htHetong);
+
+    /**
+     * 修改合同管理
+     * 
+     * @param htHetong 合同管理
+     * @return 结果
+     */
+    public int updateHtHetong(HtHetong htHetong);
+
+    /**
+     * 批量删除合同管理
+     * 
+     * @param ids 需要删除的合同管理主键集合
+     * @return 结果
+     */
+    public int deleteHtHetongByIds(Integer[] ids);
+
+    /**
+     * 删除合同管理信息
+     * 
+     * @param id 合同管理主键
+     * @return 结果
+     */
+    public int deleteHtHetongById(Integer id);
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/IHtJczcKehutongjiService.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.service;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtJczcKehutongji;
+
+/**
+ * 客户统计报Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface IHtJczcKehutongjiService 
+{
+    /**
+     * 查询客户统计报
+     * 
+     * @param id 客户统计报主键
+     * @return 客户统计报
+     */
+    public HtJczcKehutongji selectHtJczcKehutongjiById(Integer id);
+
+    /**
+     * 查询客户统计报列表
+     * 
+     * @param htJczcKehutongji 客户统计报
+     * @return 客户统计报集合
+     */
+    public List<HtJczcKehutongji> selectHtJczcKehutongjiList(HtJczcKehutongji htJczcKehutongji);
+
+    /**
+     * 新增客户统计报
+     * 
+     * @param htJczcKehutongji 客户统计报
+     * @return 结果
+     */
+    public int insertHtJczcKehutongji(HtJczcKehutongji htJczcKehutongji);
+
+    /**
+     * 修改客户统计报
+     * 
+     * @param htJczcKehutongji 客户统计报
+     * @return 结果
+     */
+    public int updateHtJczcKehutongji(HtJczcKehutongji htJczcKehutongji);
+
+    /**
+     * 批量删除客户统计报
+     * 
+     * @param ids 需要删除的客户统计报主键集合
+     * @return 结果
+     */
+    public int deleteHtJczcKehutongjiByIds(Integer[] ids);
+
+    /**
+     * 删除客户统计报信息
+     * 
+     * @param id 客户统计报主键
+     * @return 结果
+     */
+    public int deleteHtJczcKehutongjiById(Integer id);
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/IHtJczcKucuntongjiService.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.service;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtJczcKucuntongji;
+
+/**
+ * 库存统计报Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface IHtJczcKucuntongjiService 
+{
+    /**
+     * 查询库存统计报
+     * 
+     * @param id 库存统计报主键
+     * @return 库存统计报
+     */
+    public HtJczcKucuntongji selectHtJczcKucuntongjiById(Integer id);
+
+    /**
+     * 查询库存统计报列表
+     * 
+     * @param htJczcKucuntongji 库存统计报
+     * @return 库存统计报集合
+     */
+    public List<HtJczcKucuntongji> selectHtJczcKucuntongjiList(HtJczcKucuntongji htJczcKucuntongji);
+
+    /**
+     * 新增库存统计报
+     * 
+     * @param htJczcKucuntongji 库存统计报
+     * @return 结果
+     */
+    public int insertHtJczcKucuntongji(HtJczcKucuntongji htJczcKucuntongji);
+
+    /**
+     * 修改库存统计报
+     * 
+     * @param htJczcKucuntongji 库存统计报
+     * @return 结果
+     */
+    public int updateHtJczcKucuntongji(HtJczcKucuntongji htJczcKucuntongji);
+
+    /**
+     * 批量删除库存统计报
+     * 
+     * @param ids 需要删除的库存统计报主键集合
+     * @return 结果
+     */
+    public int deleteHtJczcKucuntongjiByIds(Integer[] ids);
+
+    /**
+     * 删除库存统计报信息
+     * 
+     * @param id 库存统计报主键
+     * @return 结果
+     */
+    public int deleteHtJczcKucuntongjiById(Integer id);
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/IHtJczcQipingtongjiService.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.service;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtJczcQipingtongji;
+
+/**
+ * 气瓶统计报Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface IHtJczcQipingtongjiService 
+{
+    /**
+     * 查询气瓶统计报
+     * 
+     * @param id 气瓶统计报主键
+     * @return 气瓶统计报
+     */
+    public HtJczcQipingtongji selectHtJczcQipingtongjiById(Integer id);
+
+    /**
+     * 查询气瓶统计报列表
+     * 
+     * @param htJczcQipingtongji 气瓶统计报
+     * @return 气瓶统计报集合
+     */
+    public List<HtJczcQipingtongji> selectHtJczcQipingtongjiList(HtJczcQipingtongji htJczcQipingtongji);
+
+    /**
+     * 新增气瓶统计报
+     * 
+     * @param htJczcQipingtongji 气瓶统计报
+     * @return 结果
+     */
+    public int insertHtJczcQipingtongji(HtJczcQipingtongji htJczcQipingtongji);
+
+    /**
+     * 修改气瓶统计报
+     * 
+     * @param htJczcQipingtongji 气瓶统计报
+     * @return 结果
+     */
+    public int updateHtJczcQipingtongji(HtJczcQipingtongji htJczcQipingtongji);
+
+    /**
+     * 批量删除气瓶统计报
+     * 
+     * @param ids 需要删除的气瓶统计报主键集合
+     * @return 结果
+     */
+    public int deleteHtJczcQipingtongjiByIds(Integer[] ids);
+
+    /**
+     * 删除气瓶统计报信息
+     * 
+     * @param id 气瓶统计报主键
+     * @return 结果
+     */
+    public int deleteHtJczcQipingtongjiById(Integer id);
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/IHtJczcXiaoshoutongjiService.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.service;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtJczcXiaoshoutongji;
+
+/**
+ * 销售统计报Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface IHtJczcXiaoshoutongjiService 
+{
+    /**
+     * 查询销售统计报
+     * 
+     * @param id 销售统计报主键
+     * @return 销售统计报
+     */
+    public HtJczcXiaoshoutongji selectHtJczcXiaoshoutongjiById(Integer id);
+
+    /**
+     * 查询销售统计报列表
+     * 
+     * @param htJczcXiaoshoutongji 销售统计报
+     * @return 销售统计报集合
+     */
+    public List<HtJczcXiaoshoutongji> selectHtJczcXiaoshoutongjiList(HtJczcXiaoshoutongji htJczcXiaoshoutongji);
+
+    /**
+     * 新增销售统计报
+     * 
+     * @param htJczcXiaoshoutongji 销售统计报
+     * @return 结果
+     */
+    public int insertHtJczcXiaoshoutongji(HtJczcXiaoshoutongji htJczcXiaoshoutongji);
+
+    /**
+     * 修改销售统计报
+     * 
+     * @param htJczcXiaoshoutongji 销售统计报
+     * @return 结果
+     */
+    public int updateHtJczcXiaoshoutongji(HtJczcXiaoshoutongji htJczcXiaoshoutongji);
+
+    /**
+     * 批量删除销售统计报
+     * 
+     * @param ids 需要删除的销售统计报主键集合
+     * @return 结果
+     */
+    public int deleteHtJczcXiaoshoutongjiByIds(Integer[] ids);
+
+    /**
+     * 删除销售统计报信息
+     * 
+     * @param id 销售统计报主键
+     * @return 结果
+     */
+    public int deleteHtJczcXiaoshoutongjiById(Integer id);
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/IHtQingjiaService.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.service;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtQingjia;
+
+/**
+ * 请假Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+public interface IHtQingjiaService 
+{
+    /**
+     * 查询请假
+     * 
+     * @param id 请假主键
+     * @return 请假
+     */
+    public HtQingjia selectHtQingjiaById(Integer id);
+
+    /**
+     * 查询请假列表
+     * 
+     * @param htQingjia 请假
+     * @return 请假集合
+     */
+    public List<HtQingjia> selectHtQingjiaList(HtQingjia htQingjia);
+
+    /**
+     * 新增请假
+     * 
+     * @param htQingjia 请假
+     * @return 结果
+     */
+    public int insertHtQingjia(HtQingjia htQingjia);
+
+    /**
+     * 修改请假
+     * 
+     * @param htQingjia 请假
+     * @return 结果
+     */
+    public int updateHtQingjia(HtQingjia htQingjia);
+
+    /**
+     * 批量删除请假
+     * 
+     * @param ids 需要删除的请假主键集合
+     * @return 结果
+     */
+    public int deleteHtQingjiaByIds(Integer[] ids);
+
+    /**
+     * 删除请假信息
+     * 
+     * @param id 请假主键
+     * @return 结果
+     */
+    public int deleteHtQingjiaById(Integer id);
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/IHtWeipanService.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.service;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtWeipan;
+
+/**
+ * 微盘管理Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+public interface IHtWeipanService 
+{
+    /**
+     * 查询微盘管理
+     * 
+     * @param id 微盘管理主键
+     * @return 微盘管理
+     */
+    public HtWeipan selectHtWeipanById(Long id);
+
+    /**
+     * 查询微盘管理列表
+     * 
+     * @param htWeipan 微盘管理
+     * @return 微盘管理集合
+     */
+    public List<HtWeipan> selectHtWeipanList(HtWeipan htWeipan);
+
+    /**
+     * 新增微盘管理
+     * 
+     * @param htWeipan 微盘管理
+     * @return 结果
+     */
+    public int insertHtWeipan(HtWeipan htWeipan);
+
+    /**
+     * 修改微盘管理
+     * 
+     * @param htWeipan 微盘管理
+     * @return 结果
+     */
+    public int updateHtWeipan(HtWeipan htWeipan);
+
+    /**
+     * 批量删除微盘管理
+     * 
+     * @param ids 需要删除的微盘管理主键集合
+     * @return 结果
+     */
+    public int deleteHtWeipanByIds(Long[] ids);
+
+    /**
+     * 删除微盘管理信息
+     * 
+     * @param id 微盘管理主键
+     * @return 结果
+     */
+    public int deleteHtWeipanById(Long id);
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/IHtZhiliangfenxiService.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.service;
+
+import java.util.List;
+import com.ktg.mes.md.domain.HtZhiliangfenxi;
+
+/**
+ * 数据统计与分析Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface IHtZhiliangfenxiService 
+{
+    /**
+     * 查询数据统计与分析
+     * 
+     * @param id 数据统计与分析主键
+     * @return 数据统计与分析
+     */
+    public HtZhiliangfenxi selectHtZhiliangfenxiById(Integer id);
+
+    /**
+     * 查询数据统计与分析列表
+     * 
+     * @param htZhiliangfenxi 数据统计与分析
+     * @return 数据统计与分析集合
+     */
+    public List<HtZhiliangfenxi> selectHtZhiliangfenxiList(HtZhiliangfenxi htZhiliangfenxi);
+
+    /**
+     * 新增数据统计与分析
+     * 
+     * @param htZhiliangfenxi 数据统计与分析
+     * @return 结果
+     */
+    public int insertHtZhiliangfenxi(HtZhiliangfenxi htZhiliangfenxi);
+
+    /**
+     * 修改数据统计与分析
+     * 
+     * @param htZhiliangfenxi 数据统计与分析
+     * @return 结果
+     */
+    public int updateHtZhiliangfenxi(HtZhiliangfenxi htZhiliangfenxi);
+
+    /**
+     * 批量删除数据统计与分析
+     * 
+     * @param ids 需要删除的数据统计与分析主键集合
+     * @return 结果
+     */
+    public int deleteHtZhiliangfenxiByIds(Integer[] ids);
+
+    /**
+     * 删除数据统计与分析信息
+     * 
+     * @param id 数据统计与分析主键
+     * @return 结果
+     */
+    public int deleteHtZhiliangfenxiById(Integer id);
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/impl/HtBaoxiaoServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ktg.mes.md.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ktg.mes.md.mapper.HtBaoxiaoMapper;
+import com.ktg.mes.md.domain.HtBaoxiao;
+import com.ktg.mes.md.service.IHtBaoxiaoService;
+
+/**
+ * 报销Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+@Service
+public class HtBaoxiaoServiceImpl implements IHtBaoxiaoService 
+{
+    @Autowired
+    private HtBaoxiaoMapper htBaoxiaoMapper;
+
+    /**
+     * 查询报销
+     * 
+     * @param id 报销主键
+     * @return 报销
+     */
+    @Override
+    public HtBaoxiao selectHtBaoxiaoById(Integer id)
+    {
+        return htBaoxiaoMapper.selectHtBaoxiaoById(id);
+    }
+
+    /**
+     * 查询报销列表
+     * 
+     * @param htBaoxiao 报销
+     * @return 报销
+     */
+    @Override
+    public List<HtBaoxiao> selectHtBaoxiaoList(HtBaoxiao htBaoxiao)
+    {
+        return htBaoxiaoMapper.selectHtBaoxiaoList(htBaoxiao);
+    }
+
+    /**
+     * 新增报销
+     * 
+     * @param htBaoxiao 报销
+     * @return 结果
+     */
+    @Override
+    public int insertHtBaoxiao(HtBaoxiao htBaoxiao)
+    {
+        return htBaoxiaoMapper.insertHtBaoxiao(htBaoxiao);
+    }
+
+    /**
+     * 修改报销
+     * 
+     * @param htBaoxiao 报销
+     * @return 结果
+     */
+    @Override
+    public int updateHtBaoxiao(HtBaoxiao htBaoxiao)
+    {
+        return htBaoxiaoMapper.updateHtBaoxiao(htBaoxiao);
+    }
+
+    /**
+     * 批量删除报销
+     * 
+     * @param ids 需要删除的报销主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtBaoxiaoByIds(Integer[] ids)
+    {
+        return htBaoxiaoMapper.deleteHtBaoxiaoByIds(ids);
+    }
+
+    /**
+     * 删除报销信息
+     * 
+     * @param id 报销主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtBaoxiaoById(Integer id)
+    {
+        return htBaoxiaoMapper.deleteHtBaoxiaoById(id);
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/impl/HtGglServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ktg.mes.md.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ktg.mes.md.mapper.HtGglMapper;
+import com.ktg.mes.md.domain.HtGgl;
+import com.ktg.mes.md.service.IHtGglService;
+
+/**
+ * 公告栏Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+@Service
+public class HtGglServiceImpl implements IHtGglService 
+{
+    @Autowired
+    private HtGglMapper htGglMapper;
+
+    /**
+     * 查询公告栏
+     * 
+     * @param id 公告栏主键
+     * @return 公告栏
+     */
+    @Override
+    public HtGgl selectHtGglById(Integer id)
+    {
+        return htGglMapper.selectHtGglById(id);
+    }
+
+    /**
+     * 查询公告栏列表
+     * 
+     * @param htGgl 公告栏
+     * @return 公告栏
+     */
+    @Override
+    public List<HtGgl> selectHtGglList(HtGgl htGgl)
+    {
+        return htGglMapper.selectHtGglList(htGgl);
+    }
+
+    /**
+     * 新增公告栏
+     * 
+     * @param htGgl 公告栏
+     * @return 结果
+     */
+    @Override
+    public int insertHtGgl(HtGgl htGgl)
+    {
+        return htGglMapper.insertHtGgl(htGgl);
+    }
+
+    /**
+     * 修改公告栏
+     * 
+     * @param htGgl 公告栏
+     * @return 结果
+     */
+    @Override
+    public int updateHtGgl(HtGgl htGgl)
+    {
+        return htGglMapper.updateHtGgl(htGgl);
+    }
+
+    /**
+     * 批量删除公告栏
+     * 
+     * @param ids 需要删除的公告栏主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtGglByIds(Integer[] ids)
+    {
+        return htGglMapper.deleteHtGglByIds(ids);
+    }
+
+    /**
+     * 删除公告栏信息
+     * 
+     * @param id 公告栏主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtGglById(Integer id)
+    {
+        return htGglMapper.deleteHtGglById(id);
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/impl/HtHetongServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ktg.mes.md.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ktg.mes.md.mapper.HtHetongMapper;
+import com.ktg.mes.md.domain.HtHetong;
+import com.ktg.mes.md.service.IHtHetongService;
+
+/**
+ * 合同管理Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+@Service
+public class HtHetongServiceImpl implements IHtHetongService 
+{
+    @Autowired
+    private HtHetongMapper htHetongMapper;
+
+    /**
+     * 查询合同管理
+     * 
+     * @param id 合同管理主键
+     * @return 合同管理
+     */
+    @Override
+    public HtHetong selectHtHetongById(Integer id)
+    {
+        return htHetongMapper.selectHtHetongById(id);
+    }
+
+    /**
+     * 查询合同管理列表
+     * 
+     * @param htHetong 合同管理
+     * @return 合同管理
+     */
+    @Override
+    public List<HtHetong> selectHtHetongList(HtHetong htHetong)
+    {
+        return htHetongMapper.selectHtHetongList(htHetong);
+    }
+
+    /**
+     * 新增合同管理
+     * 
+     * @param htHetong 合同管理
+     * @return 结果
+     */
+    @Override
+    public int insertHtHetong(HtHetong htHetong)
+    {
+        return htHetongMapper.insertHtHetong(htHetong);
+    }
+
+    /**
+     * 修改合同管理
+     * 
+     * @param htHetong 合同管理
+     * @return 结果
+     */
+    @Override
+    public int updateHtHetong(HtHetong htHetong)
+    {
+        return htHetongMapper.updateHtHetong(htHetong);
+    }
+
+    /**
+     * 批量删除合同管理
+     * 
+     * @param ids 需要删除的合同管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtHetongByIds(Integer[] ids)
+    {
+        return htHetongMapper.deleteHtHetongByIds(ids);
+    }
+
+    /**
+     * 删除合同管理信息
+     * 
+     * @param id 合同管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtHetongById(Integer id)
+    {
+        return htHetongMapper.deleteHtHetongById(id);
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/impl/HtJczcKehutongjiServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ktg.mes.md.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ktg.mes.md.mapper.HtJczcKehutongjiMapper;
+import com.ktg.mes.md.domain.HtJczcKehutongji;
+import com.ktg.mes.md.service.IHtJczcKehutongjiService;
+
+/**
+ * 客户统计报Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@Service
+public class HtJczcKehutongjiServiceImpl implements IHtJczcKehutongjiService 
+{
+    @Autowired
+    private HtJczcKehutongjiMapper htJczcKehutongjiMapper;
+
+    /**
+     * 查询客户统计报
+     * 
+     * @param id 客户统计报主键
+     * @return 客户统计报
+     */
+    @Override
+    public HtJczcKehutongji selectHtJczcKehutongjiById(Integer id)
+    {
+        return htJczcKehutongjiMapper.selectHtJczcKehutongjiById(id);
+    }
+
+    /**
+     * 查询客户统计报列表
+     * 
+     * @param htJczcKehutongji 客户统计报
+     * @return 客户统计报
+     */
+    @Override
+    public List<HtJczcKehutongji> selectHtJczcKehutongjiList(HtJczcKehutongji htJczcKehutongji)
+    {
+        return htJczcKehutongjiMapper.selectHtJczcKehutongjiList(htJczcKehutongji);
+    }
+
+    /**
+     * 新增客户统计报
+     * 
+     * @param htJczcKehutongji 客户统计报
+     * @return 结果
+     */
+    @Override
+    public int insertHtJczcKehutongji(HtJczcKehutongji htJczcKehutongji)
+    {
+        return htJczcKehutongjiMapper.insertHtJczcKehutongji(htJczcKehutongji);
+    }
+
+    /**
+     * 修改客户统计报
+     * 
+     * @param htJczcKehutongji 客户统计报
+     * @return 结果
+     */
+    @Override
+    public int updateHtJczcKehutongji(HtJczcKehutongji htJczcKehutongji)
+    {
+        return htJczcKehutongjiMapper.updateHtJczcKehutongji(htJczcKehutongji);
+    }
+
+    /**
+     * 批量删除客户统计报
+     * 
+     * @param ids 需要删除的客户统计报主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtJczcKehutongjiByIds(Integer[] ids)
+    {
+        return htJczcKehutongjiMapper.deleteHtJczcKehutongjiByIds(ids);
+    }
+
+    /**
+     * 删除客户统计报信息
+     * 
+     * @param id 客户统计报主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtJczcKehutongjiById(Integer id)
+    {
+        return htJczcKehutongjiMapper.deleteHtJczcKehutongjiById(id);
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/impl/HtJczcKucuntongjiServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ktg.mes.md.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ktg.mes.md.mapper.HtJczcKucuntongjiMapper;
+import com.ktg.mes.md.domain.HtJczcKucuntongji;
+import com.ktg.mes.md.service.IHtJczcKucuntongjiService;
+
+/**
+ * 库存统计报Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@Service
+public class HtJczcKucuntongjiServiceImpl implements IHtJczcKucuntongjiService 
+{
+    @Autowired
+    private HtJczcKucuntongjiMapper htJczcKucuntongjiMapper;
+
+    /**
+     * 查询库存统计报
+     * 
+     * @param id 库存统计报主键
+     * @return 库存统计报
+     */
+    @Override
+    public HtJczcKucuntongji selectHtJczcKucuntongjiById(Integer id)
+    {
+        return htJczcKucuntongjiMapper.selectHtJczcKucuntongjiById(id);
+    }
+
+    /**
+     * 查询库存统计报列表
+     * 
+     * @param htJczcKucuntongji 库存统计报
+     * @return 库存统计报
+     */
+    @Override
+    public List<HtJczcKucuntongji> selectHtJczcKucuntongjiList(HtJczcKucuntongji htJczcKucuntongji)
+    {
+        return htJczcKucuntongjiMapper.selectHtJczcKucuntongjiList(htJczcKucuntongji);
+    }
+
+    /**
+     * 新增库存统计报
+     * 
+     * @param htJczcKucuntongji 库存统计报
+     * @return 结果
+     */
+    @Override
+    public int insertHtJczcKucuntongji(HtJczcKucuntongji htJczcKucuntongji)
+    {
+        return htJczcKucuntongjiMapper.insertHtJczcKucuntongji(htJczcKucuntongji);
+    }
+
+    /**
+     * 修改库存统计报
+     * 
+     * @param htJczcKucuntongji 库存统计报
+     * @return 结果
+     */
+    @Override
+    public int updateHtJczcKucuntongji(HtJczcKucuntongji htJczcKucuntongji)
+    {
+        return htJczcKucuntongjiMapper.updateHtJczcKucuntongji(htJczcKucuntongji);
+    }
+
+    /**
+     * 批量删除库存统计报
+     * 
+     * @param ids 需要删除的库存统计报主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtJczcKucuntongjiByIds(Integer[] ids)
+    {
+        return htJczcKucuntongjiMapper.deleteHtJczcKucuntongjiByIds(ids);
+    }
+
+    /**
+     * 删除库存统计报信息
+     * 
+     * @param id 库存统计报主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtJczcKucuntongjiById(Integer id)
+    {
+        return htJczcKucuntongjiMapper.deleteHtJczcKucuntongjiById(id);
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/impl/HtJczcQipingtongjiServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ktg.mes.md.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ktg.mes.md.mapper.HtJczcQipingtongjiMapper;
+import com.ktg.mes.md.domain.HtJczcQipingtongji;
+import com.ktg.mes.md.service.IHtJczcQipingtongjiService;
+
+/**
+ * 气瓶统计报Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@Service
+public class HtJczcQipingtongjiServiceImpl implements IHtJczcQipingtongjiService 
+{
+    @Autowired
+    private HtJczcQipingtongjiMapper htJczcQipingtongjiMapper;
+
+    /**
+     * 查询气瓶统计报
+     * 
+     * @param id 气瓶统计报主键
+     * @return 气瓶统计报
+     */
+    @Override
+    public HtJczcQipingtongji selectHtJczcQipingtongjiById(Integer id)
+    {
+        return htJczcQipingtongjiMapper.selectHtJczcQipingtongjiById(id);
+    }
+
+    /**
+     * 查询气瓶统计报列表
+     * 
+     * @param htJczcQipingtongji 气瓶统计报
+     * @return 气瓶统计报
+     */
+    @Override
+    public List<HtJczcQipingtongji> selectHtJczcQipingtongjiList(HtJczcQipingtongji htJczcQipingtongji)
+    {
+        return htJczcQipingtongjiMapper.selectHtJczcQipingtongjiList(htJczcQipingtongji);
+    }
+
+    /**
+     * 新增气瓶统计报
+     * 
+     * @param htJczcQipingtongji 气瓶统计报
+     * @return 结果
+     */
+    @Override
+    public int insertHtJczcQipingtongji(HtJczcQipingtongji htJczcQipingtongji)
+    {
+        return htJczcQipingtongjiMapper.insertHtJczcQipingtongji(htJczcQipingtongji);
+    }
+
+    /**
+     * 修改气瓶统计报
+     * 
+     * @param htJczcQipingtongji 气瓶统计报
+     * @return 结果
+     */
+    @Override
+    public int updateHtJczcQipingtongji(HtJczcQipingtongji htJczcQipingtongji)
+    {
+        return htJczcQipingtongjiMapper.updateHtJczcQipingtongji(htJczcQipingtongji);
+    }
+
+    /**
+     * 批量删除气瓶统计报
+     * 
+     * @param ids 需要删除的气瓶统计报主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtJczcQipingtongjiByIds(Integer[] ids)
+    {
+        return htJczcQipingtongjiMapper.deleteHtJczcQipingtongjiByIds(ids);
+    }
+
+    /**
+     * 删除气瓶统计报信息
+     * 
+     * @param id 气瓶统计报主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtJczcQipingtongjiById(Integer id)
+    {
+        return htJczcQipingtongjiMapper.deleteHtJczcQipingtongjiById(id);
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/impl/HtJczcXiaoshoutongjiServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ktg.mes.md.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ktg.mes.md.mapper.HtJczcXiaoshoutongjiMapper;
+import com.ktg.mes.md.domain.HtJczcXiaoshoutongji;
+import com.ktg.mes.md.service.IHtJczcXiaoshoutongjiService;
+
+/**
+ * 销售统计报Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@Service
+public class HtJczcXiaoshoutongjiServiceImpl implements IHtJczcXiaoshoutongjiService 
+{
+    @Autowired
+    private HtJczcXiaoshoutongjiMapper htJczcXiaoshoutongjiMapper;
+
+    /**
+     * 查询销售统计报
+     * 
+     * @param id 销售统计报主键
+     * @return 销售统计报
+     */
+    @Override
+    public HtJczcXiaoshoutongji selectHtJczcXiaoshoutongjiById(Integer id)
+    {
+        return htJczcXiaoshoutongjiMapper.selectHtJczcXiaoshoutongjiById(id);
+    }
+
+    /**
+     * 查询销售统计报列表
+     * 
+     * @param htJczcXiaoshoutongji 销售统计报
+     * @return 销售统计报
+     */
+    @Override
+    public List<HtJczcXiaoshoutongji> selectHtJczcXiaoshoutongjiList(HtJczcXiaoshoutongji htJczcXiaoshoutongji)
+    {
+        return htJczcXiaoshoutongjiMapper.selectHtJczcXiaoshoutongjiList(htJczcXiaoshoutongji);
+    }
+
+    /**
+     * 新增销售统计报
+     * 
+     * @param htJczcXiaoshoutongji 销售统计报
+     * @return 结果
+     */
+    @Override
+    public int insertHtJczcXiaoshoutongji(HtJczcXiaoshoutongji htJczcXiaoshoutongji)
+    {
+        return htJczcXiaoshoutongjiMapper.insertHtJczcXiaoshoutongji(htJczcXiaoshoutongji);
+    }
+
+    /**
+     * 修改销售统计报
+     * 
+     * @param htJczcXiaoshoutongji 销售统计报
+     * @return 结果
+     */
+    @Override
+    public int updateHtJczcXiaoshoutongji(HtJczcXiaoshoutongji htJczcXiaoshoutongji)
+    {
+        return htJczcXiaoshoutongjiMapper.updateHtJczcXiaoshoutongji(htJczcXiaoshoutongji);
+    }
+
+    /**
+     * 批量删除销售统计报
+     * 
+     * @param ids 需要删除的销售统计报主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtJczcXiaoshoutongjiByIds(Integer[] ids)
+    {
+        return htJczcXiaoshoutongjiMapper.deleteHtJczcXiaoshoutongjiByIds(ids);
+    }
+
+    /**
+     * 删除销售统计报信息
+     * 
+     * @param id 销售统计报主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtJczcXiaoshoutongjiById(Integer id)
+    {
+        return htJczcXiaoshoutongjiMapper.deleteHtJczcXiaoshoutongjiById(id);
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/impl/HtQingjiaServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ktg.mes.md.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ktg.mes.md.mapper.HtQingjiaMapper;
+import com.ktg.mes.md.domain.HtQingjia;
+import com.ktg.mes.md.service.IHtQingjiaService;
+
+/**
+ * 请假Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+@Service
+public class HtQingjiaServiceImpl implements IHtQingjiaService 
+{
+    @Autowired
+    private HtQingjiaMapper htQingjiaMapper;
+
+    /**
+     * 查询请假
+     * 
+     * @param id 请假主键
+     * @return 请假
+     */
+    @Override
+    public HtQingjia selectHtQingjiaById(Integer id)
+    {
+        return htQingjiaMapper.selectHtQingjiaById(id);
+    }
+
+    /**
+     * 查询请假列表
+     * 
+     * @param htQingjia 请假
+     * @return 请假
+     */
+    @Override
+    public List<HtQingjia> selectHtQingjiaList(HtQingjia htQingjia)
+    {
+        return htQingjiaMapper.selectHtQingjiaList(htQingjia);
+    }
+
+    /**
+     * 新增请假
+     * 
+     * @param htQingjia 请假
+     * @return 结果
+     */
+    @Override
+    public int insertHtQingjia(HtQingjia htQingjia)
+    {
+        return htQingjiaMapper.insertHtQingjia(htQingjia);
+    }
+
+    /**
+     * 修改请假
+     * 
+     * @param htQingjia 请假
+     * @return 结果
+     */
+    @Override
+    public int updateHtQingjia(HtQingjia htQingjia)
+    {
+        return htQingjiaMapper.updateHtQingjia(htQingjia);
+    }
+
+    /**
+     * 批量删除请假
+     * 
+     * @param ids 需要删除的请假主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtQingjiaByIds(Integer[] ids)
+    {
+        return htQingjiaMapper.deleteHtQingjiaByIds(ids);
+    }
+
+    /**
+     * 删除请假信息
+     * 
+     * @param id 请假主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtQingjiaById(Integer id)
+    {
+        return htQingjiaMapper.deleteHtQingjiaById(id);
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/impl/HtWeipanServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ktg.mes.md.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ktg.mes.md.mapper.HtWeipanMapper;
+import com.ktg.mes.md.domain.HtWeipan;
+import com.ktg.mes.md.service.IHtWeipanService;
+
+/**
+ * 微盘管理Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-20
+ */
+@Service
+public class HtWeipanServiceImpl implements IHtWeipanService 
+{
+    @Autowired
+    private HtWeipanMapper htWeipanMapper;
+
+    /**
+     * 查询微盘管理
+     * 
+     * @param id 微盘管理主键
+     * @return 微盘管理
+     */
+    @Override
+    public HtWeipan selectHtWeipanById(Long id)
+    {
+        return htWeipanMapper.selectHtWeipanById(id);
+    }
+
+    /**
+     * 查询微盘管理列表
+     * 
+     * @param htWeipan 微盘管理
+     * @return 微盘管理
+     */
+    @Override
+    public List<HtWeipan> selectHtWeipanList(HtWeipan htWeipan)
+    {
+        return htWeipanMapper.selectHtWeipanList(htWeipan);
+    }
+
+    /**
+     * 新增微盘管理
+     * 
+     * @param htWeipan 微盘管理
+     * @return 结果
+     */
+    @Override
+    public int insertHtWeipan(HtWeipan htWeipan)
+    {
+        return htWeipanMapper.insertHtWeipan(htWeipan);
+    }
+
+    /**
+     * 修改微盘管理
+     * 
+     * @param htWeipan 微盘管理
+     * @return 结果
+     */
+    @Override
+    public int updateHtWeipan(HtWeipan htWeipan)
+    {
+        return htWeipanMapper.updateHtWeipan(htWeipan);
+    }
+
+    /**
+     * 批量删除微盘管理
+     * 
+     * @param ids 需要删除的微盘管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtWeipanByIds(Long[] ids)
+    {
+        return htWeipanMapper.deleteHtWeipanByIds(ids);
+    }
+
+    /**
+     * 删除微盘管理信息
+     * 
+     * @param id 微盘管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtWeipanById(Long id)
+    {
+        return htWeipanMapper.deleteHtWeipanById(id);
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/md/service/impl/HtZhiliangfenxiServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ktg.mes.md.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ktg.mes.md.mapper.HtZhiliangfenxiMapper;
+import com.ktg.mes.md.domain.HtZhiliangfenxi;
+import com.ktg.mes.md.service.IHtZhiliangfenxiService;
+
+/**
+ * 数据统计与分析Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@Service
+public class HtZhiliangfenxiServiceImpl implements IHtZhiliangfenxiService 
+{
+    @Autowired
+    private HtZhiliangfenxiMapper htZhiliangfenxiMapper;
+
+    /**
+     * 查询数据统计与分析
+     * 
+     * @param id 数据统计与分析主键
+     * @return 数据统计与分析
+     */
+    @Override
+    public HtZhiliangfenxi selectHtZhiliangfenxiById(Integer id)
+    {
+        return htZhiliangfenxiMapper.selectHtZhiliangfenxiById(id);
+    }
+
+    /**
+     * 查询数据统计与分析列表
+     * 
+     * @param htZhiliangfenxi 数据统计与分析
+     * @return 数据统计与分析
+     */
+    @Override
+    public List<HtZhiliangfenxi> selectHtZhiliangfenxiList(HtZhiliangfenxi htZhiliangfenxi)
+    {
+        return htZhiliangfenxiMapper.selectHtZhiliangfenxiList(htZhiliangfenxi);
+    }
+
+    /**
+     * 新增数据统计与分析
+     * 
+     * @param htZhiliangfenxi 数据统计与分析
+     * @return 结果
+     */
+    @Override
+    public int insertHtZhiliangfenxi(HtZhiliangfenxi htZhiliangfenxi)
+    {
+        return htZhiliangfenxiMapper.insertHtZhiliangfenxi(htZhiliangfenxi);
+    }
+
+    /**
+     * 修改数据统计与分析
+     * 
+     * @param htZhiliangfenxi 数据统计与分析
+     * @return 结果
+     */
+    @Override
+    public int updateHtZhiliangfenxi(HtZhiliangfenxi htZhiliangfenxi)
+    {
+        return htZhiliangfenxiMapper.updateHtZhiliangfenxi(htZhiliangfenxi);
+    }
+
+    /**
+     * 批量删除数据统计与分析
+     * 
+     * @param ids 需要删除的数据统计与分析主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtZhiliangfenxiByIds(Integer[] ids)
+    {
+        return htZhiliangfenxiMapper.deleteHtZhiliangfenxiByIds(ids);
+    }
+
+    /**
+     * 删除数据统计与分析信息
+     * 
+     * @param id 数据统计与分析主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHtZhiliangfenxiById(Integer id)
+    {
+        return htZhiliangfenxiMapper.deleteHtZhiliangfenxiById(id);
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java

@@ -228,6 +228,7 @@ public class ProWorkorderController extends BaseController
                 theBom.setBomItemCode(bom.getItemCode());
                 theBom.setItemOrProduct(bom.getItemOrProduct());
                 theBom.setUnitOfMeasure(bom.getUnitOfMeasure());
+                theBom.setUnitName(bom.getUnitName());
                 theBom.setBomItemSpec(bom.getItemSpc());
                 theBom.setQuantity(bom.getQuantity());
                 result.addAll(getBoms(theBom,bom.getQuantity(),0));

ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProCard.java

@@ -62,6 +62,9 @@ public class ProCard extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 赋码地址 */
     @Excel(name = "赋码地址")
     private String barcodeUrl;
@@ -97,8 +100,15 @@ public class ProCard extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date inputTime;
 
+    public String getUnitName() {
+        return unitName;
+    }
 
-    public void setCardId(Long cardId) 
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setCardId(Long cardId)
     {
         this.cardId = cardId;
     }
@@ -291,6 +301,7 @@ public class ProCard extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("barcodeUrl", getBarcodeUrl())
             .append("quantityTransfered", getQuantityTransfered())
             .append("status", getStatus())

ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProRouteProduct.java

@@ -43,6 +43,9 @@ public class ProRouteProduct extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 生产数量 */
     @Excel(name = "生产数量")
     private Long quantity;
@@ -67,7 +70,15 @@ public class ProRouteProduct extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setRecordId(Long recordId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setRecordId(Long recordId)
     {
         this.recordId = recordId;
     }
@@ -204,6 +215,7 @@ public class ProRouteProduct extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantity", getQuantity())
             .append("productionTime", getProductionTime())
             .append("timeUnitType", getTimeUnitType())

ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java

@@ -63,6 +63,9 @@ public class ProWorkorder extends TreeEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 批次号 */
     @Excel(name = "批次号")
     private String batchCode;
@@ -136,7 +139,15 @@ public class ProWorkorder extends TreeEntity
 
     private List<ProTask> tasks;
 
-    public void setWorkorderId(Long workorderId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setWorkorderId(Long workorderId)
     {
         this.workorderId = workorderId;
     }
@@ -416,6 +427,7 @@ public class ProWorkorder extends TreeEntity
                 ", productName='" + productName + '\'' +
                 ", productSpc='" + productSpc + '\'' +
                 ", unitOfMeasure='" + unitOfMeasure + '\'' +
+                ", unitName='" + unitName + '\'' +
                 ", batchCode='" + batchCode + '\'' +
                 ", quantity=" + quantity +
                 ", quantityProduced=" + quantityProduced +

ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorderBom.java

@@ -43,6 +43,9 @@ public class ProWorkorderBom extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 物料产品标识 */
     @Excel(name = "物料产品标识")
     private String itemOrProduct;
@@ -63,7 +66,15 @@ public class ProWorkorderBom extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setLineId(Long lineId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setLineId(Long lineId)
     {
         this.lineId = lineId;
     }
@@ -191,6 +202,7 @@ public class ProWorkorderBom extends BaseEntity
             .append("itemName", getItemName())
             .append("itemSpc", getItemSpc())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("itemOrProduct", getItemOrProduct())
             .append("quantity", getQuantity())
             .append("remark", getRemark())

ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIpqc.java

@@ -115,6 +115,9 @@ public class QcIpqc extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 检测数量 */
     @Excel(name = "检测数量")
     private BigDecimal quantityCheck;
@@ -180,7 +183,15 @@ public class QcIpqc extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setIpqcId(Long ipqcId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setIpqcId(Long ipqcId)
     {
         this.ipqcId = ipqcId;
     }
@@ -590,6 +601,7 @@ public class QcIpqc extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName=", getUnitName())
             .append("quantityCheck", getQuantityCheck())
             .append("quantityUnqualified", getQuantityUnqualified())
             .append("quantityQualified", getQuantityQualified())

ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqc.java

@@ -84,6 +84,9 @@ public class QcIqc extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 最低检测数 */
     @Excel(name = "最低检测数")
     private BigDecimal quantityMinCheck;
@@ -170,7 +173,15 @@ public class QcIqc extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setIqcId(Long iqcId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setIqcId(Long iqcId)
     {
         this.iqcId = iqcId;
     }
@@ -544,6 +555,7 @@ public class QcIqc extends BaseEntity
                 ", itemName='" + itemName + '\'' +
                 ", specification='" + specification + '\'' +
                 ", unitOfMeasure='" + unitOfMeasure + '\'' +
+                ", unitName='" + unitName + "\'" +
                 ", quantityMinCheck=" + quantityMinCheck +
                 ", quantityMaxUnqualified=" + quantityMaxUnqualified +
                 ", quantityRecived=" + quantityRecived +

ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcTemplateProduct.java

@@ -43,6 +43,9 @@ public class QcTemplateProduct extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 最低检测数 */
     @Excel(name = "最低检测数")
     private Long quantityCheck;
@@ -75,7 +78,15 @@ public class QcTemplateProduct extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setRecordId(Long recordId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setRecordId(Long recordId)
     {
         this.recordId = recordId;
     }
@@ -230,6 +241,7 @@ public class QcTemplateProduct extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityCheck", getQuantityCheck())
             .append("quantityUnqualified", getQuantityUnqualified())
             .append("crRate", getCrRate())

ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageAreaController.java

@@ -106,8 +106,6 @@ public class WmStorageAreaController extends BaseController
 	@DeleteMapping("/{areaIds}")
     public AjaxResult remove(@PathVariable Long[] areaIds)
     {
-        //TODO:库位删除之前的逻辑校验
+        return wmStorageAreaService.deleteWmStorageAreaByAreaIds(areaIds);
-
-        return toAjax(wmStorageAreaService.deleteWmStorageAreaByAreaIds(areaIds));
     }
 }

ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageLocationController.java

@@ -112,12 +112,6 @@ public class WmStorageLocationController extends BaseController
 	@DeleteMapping("/{locationIds}")
     public AjaxResult remove(@PathVariable Long[] locationIds)
     {
-//        //TODO:库区删除之前的逻辑校验
-//
-//        for (Long locationId: locationIds
-//             ) {
-//            wmStorageAreaService.deleteByLocationId(locationId);
-//        }
         return wmStorageLocationService.deleteWmStorageLocationByLocationIds(locationIds);
     }
 

ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java

@@ -139,15 +139,6 @@ public class WmWarehouseController extends BaseController
 	@DeleteMapping("/{warehouseIds}")
     public AjaxResult remove(@PathVariable Long[] warehouseIds)
     {
-
+        return wmWarehouseService.deleteWmWarehouseByWarehouseIds(warehouseIds);
-        //TODO:仓库删除之前的逻辑校验
-
-        for (Long wahouseId: warehouseIds
-             ) {
-            wmStorageLocationService.deleteByWarehouseId(wahouseId);
-            wmStorageAreaService.deleteByWarehouseId(wahouseId);
-        }
-
-        return toAjax(wmWarehouseService.deleteWmWarehouseByWarehouseIds(warehouseIds));
     }
 }

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmArrivalNoticeLine.java

@@ -43,6 +43,9 @@ public class WmArrivalNoticeLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 到货数量 */
     @Excel(name = "到货数量")
     private BigDecimal quantityArrival;
@@ -75,7 +78,15 @@ public class WmArrivalNoticeLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setLineId(Long lineId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setLineId(Long lineId)
     {
         this.lineId = lineId;
     }

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueLine.java

@@ -45,6 +45,9 @@ public class WmIssueLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 领料数量 */
     @Excel(name = "领料数量")
     private BigDecimal quantityIssued;
@@ -101,7 +104,15 @@ public class WmIssueLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setLineId(Long lineId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setLineId(Long lineId)
     {
         this.lineId = lineId;
     }
@@ -318,6 +329,7 @@ public class WmIssueLine extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityIssued", getQuantityIssued())
             .append("batchCode", getBatchCode())
             .append("warehouseId", getWarehouseId())

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmItemRecptLine.java

@@ -50,6 +50,9 @@ public class WmItemRecptLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 入库数量 */
     @Excel(name = "入库数量")
     private BigDecimal quantityRecived;
@@ -126,7 +129,15 @@ public class WmItemRecptLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setLineId(Long lineId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setLineId(Long lineId)
     {
         this.lineId = lineId;
     }
@@ -369,6 +380,7 @@ public class WmItemRecptLine extends BaseEntity
                 ", itemName='" + itemName + '\'' +
                 ", specification='" + specification + '\'' +
                 ", unitOfMeasure='" + unitOfMeasure + '\'' +
+                ", unitName='" + unitName + '\'' +
                 ", quantityRecived=" + quantityRecived +
                 ", batchCode='" + batchCode + '\'' +
                 ", warehouseId=" + warehouseId +

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceIssueLine.java

@@ -47,6 +47,9 @@ public class WmOutsourceIssueLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 领料数量 */
     @Excel(name = "领料数量")
     private BigDecimal quantityIssued;
@@ -103,7 +106,15 @@ public class WmOutsourceIssueLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setLineId(Long lineId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setLineId(Long lineId)
     {
         this.lineId = lineId;
     }
@@ -322,6 +333,7 @@ public class WmOutsourceIssueLine extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityIssued", getQuantityIssued())
             .append("batchCode", getBatchCode())
             .append("warehouseId", getWarehouseId())

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceRecptLine.java

@@ -45,6 +45,9 @@ public class WmOutsourceRecptLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 入库数量 */
     @Excel(name = "入库数量")
     private BigDecimal quantityRecived;
@@ -118,7 +121,15 @@ public class WmOutsourceRecptLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setLineId(Long lineId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setLineId(Long lineId)
     {
         this.lineId = lineId;
     }
@@ -363,6 +374,7 @@ public class WmOutsourceRecptLine extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityRecived", getQuantityRecived())
             .append("batchCode", getBatchCode())
             .append("warehouseId", getWarehouseId())

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmPackageLine.java

@@ -49,6 +49,9 @@ public class WmPackageLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 装箱数量 */
     @Excel(name = "装箱数量")
     private BigDecimal quantityPackage;
@@ -118,7 +121,15 @@ public class WmPackageLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setLineId(Long lineId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setLineId(Long lineId)
     {
         this.lineId = lineId;
     }
@@ -364,6 +375,7 @@ public class WmPackageLine extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityPackage", getQuantityPackage())
             .append("workorderId", getWorkorderId())
             .append("workorderCode", getWorkorderCode())

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecptLine.java

@@ -50,6 +50,9 @@ public class WmProductRecptLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 入库数量 */
     @Excel(name = "入库数量")
     private BigDecimal quantityRecived;
@@ -111,7 +114,15 @@ public class WmProductRecptLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setLineId(Long lineId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setLineId(Long lineId)
     {
         this.lineId = lineId;
     }
@@ -339,6 +350,7 @@ public class WmProductRecptLine extends BaseEntity
                 ", itemName='" + itemName + '\'' +
                 ", specification='" + specification + '\'' +
                 ", unitOfMeasure='" + unitOfMeasure + '\'' +
+                ", unitName='" + unitName + '\'' +
                 ", quantityRecived=" + quantityRecived +
                 ", batchCode='" + batchCode + '\'' +
                 ", warehouseId=" + warehouseId +

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductSalseLine.java

@@ -47,6 +47,9 @@ public class WmProductSalseLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 出库数量 */
     @Excel(name = "出库数量")
     private BigDecimal quantitySalse;
@@ -118,7 +121,15 @@ public class WmProductSalseLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setLineId(Long lineId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setLineId(Long lineId)
     {
         this.lineId = lineId;
     }
@@ -362,6 +373,7 @@ public class WmProductSalseLine extends BaseEntity
                 ", itemName='" + itemName + '\'' +
                 ", specification='" + specification + '\'' +
                 ", unitOfMeasure='" + unitOfMeasure + '\'' +
+                ", unitName='" + unitName + '\'' +
                 ", quantitySalse=" + quantitySalse +
                 ", batchCode='" + batchCode + '\'' +
                 ", warehouseId=" + warehouseId +

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtIssueLine.java

@@ -47,6 +47,9 @@ public class WmRtIssueLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 退料数量 */
     @Excel(name = "退料数量")
     private BigDecimal quantityRt;
@@ -103,7 +106,15 @@ public class WmRtIssueLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setLineId(Long lineId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setLineId(Long lineId)
     {
         this.lineId = lineId;
     }
@@ -322,6 +333,7 @@ public class WmRtIssueLine extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityRt", getQuantityRt())
             .append("batchCode", getBatchCode())
             .append("warehouseId", getWarehouseId())

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtSalseLine.java

@@ -45,6 +45,9 @@ public class WmRtSalseLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 退货数量 */
     @Excel(name = "退货数量")
     private BigDecimal quantityRted;
@@ -106,7 +109,15 @@ public class WmRtSalseLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setLineId(Long lineId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setLineId(Long lineId)
     {
         this.lineId = lineId;
     }
@@ -324,6 +335,7 @@ public class WmRtSalseLine extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityRted", getQuantityRted())
             .append("batchCode", getBatchCode())
             .append("warehouseId", getWarehouseId())

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtVendorLine.java

@@ -45,6 +45,9 @@ public class WmRtVendorLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 退货数量 */
     @Excel(name = "退货数量")
     private BigDecimal quantityRted;
@@ -101,7 +104,15 @@ public class WmRtVendorLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setLineId(Long lineId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setLineId(Long lineId)
     {
         this.lineId = lineId;
     }
@@ -320,6 +331,7 @@ public class WmRtVendorLine extends BaseEntity
                 ", itemName='" + itemName + '\'' +
                 ", specification='" + specification + '\'' +
                 ", unitOfMeasure='" + unitOfMeasure + '\'' +
+                ", unitName='" + unitName + '\'' +
                 ", quantityRted=" + quantityRted +
                 ", batchCode='" + batchCode + '\'' +
                 ", warehouseId=" + warehouseId +

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmSn.java

@@ -45,6 +45,9 @@ public class WmSn extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 批次号 */
     @Excel(name = "批次号")
     private String batchCode;
@@ -80,7 +83,15 @@ public class WmSn extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setSnId(Long snId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setSnId(Long snId)
     {
         this.snId = snId;
     }
@@ -249,6 +260,7 @@ public class WmSn extends BaseEntity
                 ", itemName='" + itemName + '\'' +
                 ", specification='" + specification + '\'' +
                 ", unitOfMeasure='" + unitOfMeasure + '\'' +
+                ", unitName='" + unitName + '\'' +
                 ", batchCode='" + batchCode + '\'' +
                 ", snNum=" + snNum +
                 ", genDate=" + genDate +

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransferLine.java

@@ -49,6 +49,9 @@ public class WmTransferLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 装箱数量 */
     @Excel(name = "装箱数量")
     private BigDecimal quantityTransfer;
@@ -170,7 +173,15 @@ public class WmTransferLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setLineId(Long lineId) 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setLineId(Long lineId)
     {
         this.lineId = lineId;
     }
@@ -533,6 +544,7 @@ public class WmTransferLine extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityTransfer", getQuantityTransfer())
             .append("workorderId", getWorkorderId())
             .append("workorderCode", getWorkorderCode())

ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmMaterialStockMapper.java

@@ -1,6 +1,7 @@
 package com.ktg.mes.wm.mapper;
 
 import com.ktg.mes.wm.domain.WmMaterialStock;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -70,4 +71,20 @@ public interface WmMaterialStockMapper
      * @return 结果
      */
     public int deleteWmMaterialStockByMaterialStockIds(Long[] materialStockIds);
+
+    /**
+     * 根据库位id查询相关库存现有量数据
+     * @param areaId
+     * @return
+     */
+    List<WmMaterialStock> getByAreaId(@Param("areaId") Long areaId);
+
+    /**
+     * 根据库区id查询相关库存现有量
+     * @param locationId
+     * @return
+     */
+    List<WmMaterialStock> getLocationId(@Param("locationId") Long locationId);
+
+    List<WmMaterialStock> getByWarehouseId(@Param("warehouseId") Long warehouseId);
 }

ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java

@@ -2,6 +2,7 @@ package com.ktg.mes.wm.mapper;
 
 import java.util.List;
 import com.ktg.mes.wm.domain.WmStorageArea;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 库位设置Mapper接口
@@ -90,4 +91,8 @@ public interface WmStorageAreaMapper
      * @return
      */
     public int deleteByLocationId(Long locationId);
+
+    List<WmStorageArea> selectByAreaIds(@Param("ids") Long[] areaIds);
+
+    int deleteByLocationIds(@Param("ids") Long[] locationIds);
 }

ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java

@@ -2,6 +2,7 @@ package com.ktg.mes.wm.mapper;
 
 import java.util.List;
 import com.ktg.mes.wm.domain.WmWarehouse;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 仓库设置Mapper接口
@@ -72,4 +73,10 @@ public interface WmWarehouseMapper
      */
     public int deleteWmWarehouseByWarehouseIds(Long[] warehouseIds);
 
+    /**
+     * 根据仓库id查询相关仓库数据
+     * @param warehouseIds
+     * @return
+     */
+    List<WmWarehouse> selectByWarehouseId(@Param("ids") Long[] warehouseIds);
 }

ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmMaterialStockService.java

@@ -71,4 +71,25 @@ public interface IWmMaterialStockService
      * @return 结果
      */
     public int deleteWmMaterialStockByMaterialStockId(Long materialStockId);
+
+    /**
+     * 根据库位id查询相关库存现有量数据
+     * @param areaId
+     * @return
+     */
+    List<WmMaterialStock> getByAreaId(Long areaId);
+
+    /**
+     * 根据库区id查询相关库存现有量
+     * @param locationId
+     * @return
+     */
+    List<WmMaterialStock> getLocationId(Long locationId);
+
+    /**
+     * 根据仓库id查询相关库存现有量
+     * @param warehouseId
+     * @return
+     */
+    List<WmMaterialStock> getByWarehouseId(Long warehouseId);
 }

ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java

@@ -1,6 +1,8 @@
 package com.ktg.mes.wm.service;
 
 import java.util.List;
+
+import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.mes.wm.domain.WmStorageArea;
 
 /**
@@ -67,11 +69,11 @@ public interface IWmStorageAreaService
 
     /**
      * 批量删除库位设置
-     * 
+     *
      * @param areaIds 需要删除的库位设置主键集合
      * @return 结果
      */
-    public int deleteWmStorageAreaByAreaIds(Long[] areaIds);
+    public AjaxResult deleteWmStorageAreaByAreaIds(Long[] areaIds);
 
     /**
      * 删除库位设置信息
@@ -94,4 +96,12 @@ public interface IWmStorageAreaService
      * @return
      */
     public int deleteByLocationId(Long locationId);
+
+    /**
+     * 根据库区ids删除相关的库位数据
+     *
+     * @param locationIds
+     * @return
+     */
+    int deleteByLocationIds(Long[] locationIds);
 }