功能

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

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/lxsm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: your_username
+                username: root
-                password: your_password
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ktg-mes/src/main/java/com/ktg/mes/cg/controller/InquiryQuotationController.java

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

ktg-mes/src/main/java/com/ktg/mes/cg/controller/ProcurementPlanController.java

@@ -0,0 +1,98 @@
+package com.ktg.mes.cg.controller;
+
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.core.domain.AjaxResult;
+import com.ktg.common.core.page.TableDataInfo;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.mes.cg.domain.ProcurementPlan;
+import com.ktg.mes.cg.service.IProcurementPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 采购计划Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-24
+ */
+@RestController
+@RequestMapping("/md/plan")
+public class ProcurementPlanController extends BaseController
+{
+    @Autowired
+    private IProcurementPlanService procurementPlanService;
+
+    /**
+     * 查询采购计划列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:plan:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ProcurementPlan procurementPlan)
+    {
+        startPage();
+        List<ProcurementPlan> list = procurementPlanService.selectProcurementPlanList(procurementPlan);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出采购计划列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:plan:export')")
+    @Log(title = "采购计划", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ProcurementPlan procurementPlan)
+    {
+        List<ProcurementPlan> list = procurementPlanService.selectProcurementPlanList(procurementPlan);
+        ExcelUtil<ProcurementPlan> util = new ExcelUtil<ProcurementPlan>(ProcurementPlan.class);
+        util.exportExcel(response, list, "采购计划数据");
+    }
+
+    /**
+     * 获取采购计划详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:plan:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(procurementPlanService.selectProcurementPlanById(id));
+    }
+
+    /**
+     * 新增采购计划
+     */
+    @PreAuthorize("@ss.hasPermi('md:plan:add')")
+    @Log(title = "采购计划", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ProcurementPlan procurementPlan)
+    {
+        return toAjax(procurementPlanService.insertProcurementPlan(procurementPlan));
+    }
+
+    /**
+     * 修改采购计划
+     */
+    @PreAuthorize("@ss.hasPermi('md:plan:edit')")
+    @Log(title = "采购计划", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ProcurementPlan procurementPlan)
+    {
+        return toAjax(procurementPlanService.updateProcurementPlan(procurementPlan));
+    }
+
+    /**
+     * 删除采购计划
+     */
+    @PreAuthorize("@ss.hasPermi('md:plan:remove')")
+    @Log(title = "采购计划", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(procurementPlanService.deleteProcurementPlanByIds(ids));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/cg/controller/PurchaseOrderController.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.PurchaseOrder;
+import com.ktg.mes.md.service.IPurchaseOrderService;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.common.core.page.TableDataInfo;
+
+/**
+ * 采购订单Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-24
+ */
+@RestController
+@RequestMapping("/md/order")
+public class PurchaseOrderController extends BaseController
+{
+    @Autowired
+    private IPurchaseOrderService purchaseOrderService;
+
+    /**
+     * 查询采购订单列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:order:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PurchaseOrder purchaseOrder)
+    {
+        startPage();
+        List<PurchaseOrder> list = purchaseOrderService.selectPurchaseOrderList(purchaseOrder);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出采购订单列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:order:export')")
+    @Log(title = "采购订单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, PurchaseOrder purchaseOrder)
+    {
+        List<PurchaseOrder> list = purchaseOrderService.selectPurchaseOrderList(purchaseOrder);
+        ExcelUtil<PurchaseOrder> util = new ExcelUtil<PurchaseOrder>(PurchaseOrder.class);
+        util.exportExcel(response, list, "采购订单数据");
+    }
+
+    /**
+     * 获取采购订单详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:order:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(purchaseOrderService.selectPurchaseOrderById(id));
+    }
+
+    /**
+     * 新增采购订单
+     */
+    @PreAuthorize("@ss.hasPermi('md:order:add')")
+    @Log(title = "采购订单", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody PurchaseOrder purchaseOrder)
+    {
+        return toAjax(purchaseOrderService.insertPurchaseOrder(purchaseOrder));
+    }
+
+    /**
+     * 修改采购订单
+     */
+    @PreAuthorize("@ss.hasPermi('md:order:edit')")
+    @Log(title = "采购订单", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody PurchaseOrder purchaseOrder)
+    {
+        return toAjax(purchaseOrderService.updatePurchaseOrder(purchaseOrder));
+    }
+
+    /**
+     * 删除采购订单
+     */
+    @PreAuthorize("@ss.hasPermi('md:order:remove')")
+    @Log(title = "采购订单", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(purchaseOrderService.deletePurchaseOrderByIds(ids));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/cg/domain/InquiryQuotation.java

@@ -0,0 +1,293 @@
+package com.ktg.mes.cg.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;
+
+/**
+ * 询报比价对象 inquiry_quotation
+ * 
+ * @author yinjinlu
+ * @date 2025-02-24
+ */
+public class InquiryQuotation extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 询报比价编号 */
+    @Excel(name = "询报比价编号")
+    private String inquiryNo;
+
+    /** 询报比价标题 */
+    @Excel(name = "询报比价标题")
+    private String title;
+
+    /** 发起人ID */
+    @Excel(name = "发起人ID")
+    private Long initiatorId;
+
+    /** 发起人姓名 */
+    @Excel(name = "发起人姓名")
+    private String initiatorName;
+
+    /** 发起时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "发起时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date initiateDate;
+
+    /** 材料ID */
+    @Excel(name = "材料ID")
+    private Long materialId;
+
+    /** 材料名称 */
+    @Excel(name = "材料名称")
+    private String materialName;
+
+    /** 	需求数量 */
+    @Excel(name = "	需求数量")
+    private Long quantity;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 规格 */
+    @Excel(name = "规格")
+    private String specs;
+
+    /** 供应商ID */
+    @Excel(name = "供应商ID")
+    private Long vendorId;
+
+    /** 供应商名称 */
+    @Excel(name = "供应商名称")
+    private String vendorName;
+
+    /** 单价 */
+    @Excel(name = "单价")
+    private Long unitPrice;
+
+    /** 总价 */
+    @Excel(name = "总价")
+    private Long totalPrice;
+
+    /** 	交货时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "	交货时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deliveryTime;
+
+    /** 付款方式 */
+    @Excel(name = "付款方式")
+    private String paymentTerms;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String status;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setInquiryNo(String inquiryNo) 
+    {
+        this.inquiryNo = inquiryNo;
+    }
+
+    public String getInquiryNo() 
+    {
+        return inquiryNo;
+    }
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+    public void setInitiatorId(Long initiatorId) 
+    {
+        this.initiatorId = initiatorId;
+    }
+
+    public Long getInitiatorId() 
+    {
+        return initiatorId;
+    }
+    public void setInitiatorName(String initiatorName) 
+    {
+        this.initiatorName = initiatorName;
+    }
+
+    public String getInitiatorName() 
+    {
+        return initiatorName;
+    }
+    public void setInitiateDate(Date initiateDate) 
+    {
+        this.initiateDate = initiateDate;
+    }
+
+    public Date getInitiateDate() 
+    {
+        return initiateDate;
+    }
+    public void setMaterialId(Long materialId) 
+    {
+        this.materialId = materialId;
+    }
+
+    public Long getMaterialId() 
+    {
+        return materialId;
+    }
+    public void setMaterialName(String materialName) 
+    {
+        this.materialName = materialName;
+    }
+
+    public String getMaterialName() 
+    {
+        return materialName;
+    }
+    public void setQuantity(Long quantity) 
+    {
+        this.quantity = quantity;
+    }
+
+    public Long getQuantity() 
+    {
+        return quantity;
+    }
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+    public void setSpecs(String specs) 
+    {
+        this.specs = specs;
+    }
+
+    public String getSpecs() 
+    {
+        return specs;
+    }
+    public void setVendorId(Long vendorId) 
+    {
+        this.vendorId = vendorId;
+    }
+
+    public Long getVendorId() 
+    {
+        return vendorId;
+    }
+    public void setVendorName(String vendorName) 
+    {
+        this.vendorName = vendorName;
+    }
+
+    public String getVendorName() 
+    {
+        return vendorName;
+    }
+    public void setUnitPrice(Long unitPrice) 
+    {
+        this.unitPrice = unitPrice;
+    }
+
+    public Long getUnitPrice() 
+    {
+        return unitPrice;
+    }
+    public void setTotalPrice(Long totalPrice) 
+    {
+        this.totalPrice = totalPrice;
+    }
+
+    public Long getTotalPrice() 
+    {
+        return totalPrice;
+    }
+    public void setDeliveryTime(Date deliveryTime) 
+    {
+        this.deliveryTime = deliveryTime;
+    }
+
+    public Date getDeliveryTime() 
+    {
+        return deliveryTime;
+    }
+    public void setPaymentTerms(String paymentTerms) 
+    {
+        this.paymentTerms = paymentTerms;
+    }
+
+    public String getPaymentTerms() 
+    {
+        return paymentTerms;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("inquiryNo", getInquiryNo())
+            .append("title", getTitle())
+            .append("initiatorId", getInitiatorId())
+            .append("initiatorName", getInitiatorName())
+            .append("initiateDate", getInitiateDate())
+            .append("materialId", getMaterialId())
+            .append("materialName", getMaterialName())
+            .append("quantity", getQuantity())
+            .append("unit", getUnit())
+            .append("specs", getSpecs())
+            .append("vendorId", getVendorId())
+            .append("vendorName", getVendorName())
+            .append("unitPrice", getUnitPrice())
+            .append("totalPrice", getTotalPrice())
+            .append("deliveryTime", getDeliveryTime())
+            .append("paymentTerms", getPaymentTerms())
+            .append("status", getStatus())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/cg/domain/ProcurementPlan.java

@@ -0,0 +1,365 @@
+package com.ktg.mes.cg.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 采购计划对象 procurement_plan
+ * 
+ * @author yinjinlu
+ * @date 2025-02-24
+ */
+public class ProcurementPlan extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** Id */
+    private Long id;
+
+    /** 采购计划编号 */
+    @Excel(name = "采购计划编号")
+    private String planNo;
+
+    /** 采购计划标题 */
+    @Excel(name = "采购计划标题")
+    private String title;
+
+    /** 发起人ID */
+    @Excel(name = "发起人ID")
+    private Long initiatorId;
+
+    /** 发起人姓名 */
+    @Excel(name = "发起人姓名")
+    private String initiatorName;
+
+    /** 发起时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "发起时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date initiateDate;
+
+    /** 物料ID */
+    @Excel(name = "物料ID")
+    private Long materialId;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    /** 采购数量 */
+    @Excel(name = "采购数量")
+    private String quantity;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 规格 */
+    @Excel(name = "规格")
+    private String specs;
+
+    /** 供应商ID */
+    @Excel(name = "供应商ID")
+    private Long vendorId;
+
+    /** 供应商名称 */
+    @Excel(name = "供应商名称")
+    private String vendorName;
+
+    /** 单价 */
+    @Excel(name = "单价")
+    private Long unitPrice;
+
+    /** 总价 */
+    @Excel(name = "总价")
+    private Long totalPrice;
+
+    /** 交货时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "交货时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deliveryTime;
+
+    /** 付款方式 */
+    @Excel(name = "付款方式")
+    private String paymentTerms;
+
+    /** 预算金额 */
+    @Excel(name = "预算金额")
+    private String budgetAmount;
+
+    /** 实际金额 */
+    @Excel(name = "实际金额")
+    private String actualAmount;
+
+    /** 审批人ID */
+    @Excel(name = "审批人ID")
+    private Long approverId;
+
+    /** 审批人姓名 */
+    @Excel(name = "审批人姓名")
+    private String approverName;
+
+    /** 审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approvalDate;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String status;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setPlanNo(String planNo) 
+    {
+        this.planNo = planNo;
+    }
+
+    public String getPlanNo() 
+    {
+        return planNo;
+    }
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+    public void setInitiatorId(Long initiatorId) 
+    {
+        this.initiatorId = initiatorId;
+    }
+
+    public Long getInitiatorId() 
+    {
+        return initiatorId;
+    }
+    public void setInitiatorName(String initiatorName) 
+    {
+        this.initiatorName = initiatorName;
+    }
+
+    public String getInitiatorName() 
+    {
+        return initiatorName;
+    }
+    public void setInitiateDate(Date initiateDate) 
+    {
+        this.initiateDate = initiateDate;
+    }
+
+    public Date getInitiateDate() 
+    {
+        return initiateDate;
+    }
+    public void setMaterialId(Long materialId) 
+    {
+        this.materialId = materialId;
+    }
+
+    public Long getMaterialId() 
+    {
+        return materialId;
+    }
+    public void setMaterialName(String materialName) 
+    {
+        this.materialName = materialName;
+    }
+
+    public String getMaterialName() 
+    {
+        return materialName;
+    }
+    public void setQuantity(String quantity) 
+    {
+        this.quantity = quantity;
+    }
+
+    public String getQuantity() 
+    {
+        return quantity;
+    }
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+    public void setSpecs(String specs) 
+    {
+        this.specs = specs;
+    }
+
+    public String getSpecs() 
+    {
+        return specs;
+    }
+    public void setVendorId(Long vendorId) 
+    {
+        this.vendorId = vendorId;
+    }
+
+    public Long getVendorId() 
+    {
+        return vendorId;
+    }
+    public void setVendorName(String vendorName) 
+    {
+        this.vendorName = vendorName;
+    }
+
+    public String getVendorName() 
+    {
+        return vendorName;
+    }
+    public void setUnitPrice(Long unitPrice) 
+    {
+        this.unitPrice = unitPrice;
+    }
+
+    public Long getUnitPrice() 
+    {
+        return unitPrice;
+    }
+    public void setTotalPrice(Long totalPrice) 
+    {
+        this.totalPrice = totalPrice;
+    }
+
+    public Long getTotalPrice() 
+    {
+        return totalPrice;
+    }
+    public void setDeliveryTime(Date deliveryTime) 
+    {
+        this.deliveryTime = deliveryTime;
+    }
+
+    public Date getDeliveryTime() 
+    {
+        return deliveryTime;
+    }
+    public void setPaymentTerms(String paymentTerms) 
+    {
+        this.paymentTerms = paymentTerms;
+    }
+
+    public String getPaymentTerms() 
+    {
+        return paymentTerms;
+    }
+    public void setBudgetAmount(String budgetAmount) 
+    {
+        this.budgetAmount = budgetAmount;
+    }
+
+    public String getBudgetAmount() 
+    {
+        return budgetAmount;
+    }
+    public void setActualAmount(String actualAmount) 
+    {
+        this.actualAmount = actualAmount;
+    }
+
+    public String getActualAmount() 
+    {
+        return actualAmount;
+    }
+    public void setApproverId(Long approverId) 
+    {
+        this.approverId = approverId;
+    }
+
+    public Long getApproverId() 
+    {
+        return approverId;
+    }
+    public void setApproverName(String approverName) 
+    {
+        this.approverName = approverName;
+    }
+
+    public String getApproverName() 
+    {
+        return approverName;
+    }
+    public void setApprovalDate(Date approvalDate) 
+    {
+        this.approvalDate = approvalDate;
+    }
+
+    public Date getApprovalDate() 
+    {
+        return approvalDate;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("planNo", getPlanNo())
+            .append("title", getTitle())
+            .append("initiatorId", getInitiatorId())
+            .append("initiatorName", getInitiatorName())
+            .append("initiateDate", getInitiateDate())
+            .append("materialId", getMaterialId())
+            .append("materialName", getMaterialName())
+            .append("quantity", getQuantity())
+            .append("unit", getUnit())
+            .append("specs", getSpecs())
+            .append("vendorId", getVendorId())
+            .append("vendorName", getVendorName())
+            .append("unitPrice", getUnitPrice())
+            .append("totalPrice", getTotalPrice())
+            .append("deliveryTime", getDeliveryTime())
+            .append("paymentTerms", getPaymentTerms())
+            .append("budgetAmount", getBudgetAmount())
+            .append("actualAmount", getActualAmount())
+            .append("approverId", getApproverId())
+            .append("approverName", getApproverName())
+            .append("approvalDate", getApprovalDate())
+            .append("status", getStatus())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/cg/domain/PurchaseOrder.java

@@ -0,0 +1,451 @@
+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;
+
+/**
+ * 采购订单对象 purchase_order
+ * 
+ * @author yinjinlu
+ * @date 2025-02-24
+ */
+public class PurchaseOrder extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 采购订单ID，自增主键 */
+    private Long id;
+
+    /** 采购订单编号，格式如PO20231001 */
+    @Excel(name = "采购订单编号，格式如PO20231001")
+    private String orderNo;
+
+    /** 采购订单标题或简要描述 */
+    @Excel(name = "采购订单标题或简要描述")
+    private String title;
+
+    /** 供应商ID，关联到vendor表 */
+    @Excel(name = "供应商ID，关联到vendor表")
+    private Long vendorId;
+
+    /** 供应商名称 */
+    @Excel(name = "供应商名称")
+    private String vendorName;
+
+    /** 供应商联系人 */
+    @Excel(name = "供应商联系人")
+    private String vendorContact;
+
+    /** 供应商联系电话 */
+    @Excel(name = "供应商联系电话")
+    private String vendorPhone;
+
+    /** 物料ID，关联到material表 */
+    @Excel(name = "物料ID，关联到material表")
+    private Long materialId;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    /** 物料规格 */
+    @Excel(name = "物料规格")
+    private String specs;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 采购数量 */
+    @Excel(name = "采购数量")
+    private BigDecimal quantity;
+
+    /** 单价 */
+    @Excel(name = "单价")
+    private BigDecimal unitPrice;
+
+    /** 订货金额（单价×数量） */
+    @Excel(name = "订货金额", readConverterExp = "单=价×数量")
+    private BigDecimal orderAmount;
+
+    /** 税金 */
+    @Excel(name = "税金")
+    private BigDecimal tax;
+
+    /** 总金额（订货金额 + 税金） */
+    @Excel(name = "总金额", readConverterExp = "订=货金额,+=,税=金")
+    private BigDecimal totalAmount;
+
+    /** 付款方式，例如：预付50%，余款到货后30天内支付 */
+    @Excel(name = "付款方式，例如：预付50%，余款到货后30天内支付")
+    private String paymentTerms;
+
+    /** 付款状态：未付款、部分付款、已付款 */
+    @Excel(name = "付款状态：未付款、部分付款、已付款")
+    private String paymentStatus;
+
+    /** 交货地址 */
+    @Excel(name = "交货地址")
+    private String deliveryAddress;
+
+    /** 预期交货日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "预期交货日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date expectedDeliveryDate;
+
+    /** 实际交货日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "实际交货日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date actualDeliveryDate;
+
+    /** 运输方式：公路、铁路、航空、海运等 */
+    @Excel(name = "运输方式：公路、铁路、航空、海运等")
+    private String shippingMethod;
+
+    /** 运输费用 */
+    @Excel(name = "运输费用")
+    private BigDecimal shippingCost;
+
+    /** 订单状态：草稿、已审批、进行中、已完成、已取消 */
+    @Excel(name = "订单状态：草稿、已审批、进行中、已完成、已取消")
+    private String status;
+
+    /** 发起人ID，关联到employee表 */
+    @Excel(name = "发起人ID，关联到employee表")
+    private Long initiatorId;
+
+    /** 发起日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "发起日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date initiateDate;
+
+    /** 审批人ID，关联到employee表 */
+    @Excel(name = "审批人ID，关联到employee表")
+    private Long approverId;
+
+    /** 审批日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审批日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approvalDate;
+
+    /** 备注或额外说明 */
+    @Excel(name = "备注或额外说明")
+    private String remarks;
+
+    /** 记录创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdDate;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setOrderNo(String orderNo) 
+    {
+        this.orderNo = orderNo;
+    }
+
+    public String getOrderNo() 
+    {
+        return orderNo;
+    }
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+    public void setVendorId(Long vendorId) 
+    {
+        this.vendorId = vendorId;
+    }
+
+    public Long getVendorId() 
+    {
+        return vendorId;
+    }
+    public void setVendorName(String vendorName) 
+    {
+        this.vendorName = vendorName;
+    }
+
+    public String getVendorName() 
+    {
+        return vendorName;
+    }
+    public void setVendorContact(String vendorContact) 
+    {
+        this.vendorContact = vendorContact;
+    }
+
+    public String getVendorContact() 
+    {
+        return vendorContact;
+    }
+    public void setVendorPhone(String vendorPhone) 
+    {
+        this.vendorPhone = vendorPhone;
+    }
+
+    public String getVendorPhone() 
+    {
+        return vendorPhone;
+    }
+    public void setMaterialId(Long materialId) 
+    {
+        this.materialId = materialId;
+    }
+
+    public Long getMaterialId() 
+    {
+        return materialId;
+    }
+    public void setMaterialName(String materialName) 
+    {
+        this.materialName = materialName;
+    }
+
+    public String getMaterialName() 
+    {
+        return materialName;
+    }
+    public void setSpecs(String specs) 
+    {
+        this.specs = specs;
+    }
+
+    public String getSpecs() 
+    {
+        return specs;
+    }
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+    public void setQuantity(BigDecimal quantity) 
+    {
+        this.quantity = quantity;
+    }
+
+    public BigDecimal getQuantity() 
+    {
+        return quantity;
+    }
+    public void setUnitPrice(BigDecimal unitPrice) 
+    {
+        this.unitPrice = unitPrice;
+    }
+
+    public BigDecimal getUnitPrice() 
+    {
+        return unitPrice;
+    }
+    public void setOrderAmount(BigDecimal orderAmount) 
+    {
+        this.orderAmount = orderAmount;
+    }
+
+    public BigDecimal getOrderAmount() 
+    {
+        return orderAmount;
+    }
+    public void setTax(BigDecimal tax) 
+    {
+        this.tax = tax;
+    }
+
+    public BigDecimal getTax() 
+    {
+        return tax;
+    }
+    public void setTotalAmount(BigDecimal totalAmount) 
+    {
+        this.totalAmount = totalAmount;
+    }
+
+    public BigDecimal getTotalAmount() 
+    {
+        return totalAmount;
+    }
+    public void setPaymentTerms(String paymentTerms) 
+    {
+        this.paymentTerms = paymentTerms;
+    }
+
+    public String getPaymentTerms() 
+    {
+        return paymentTerms;
+    }
+    public void setPaymentStatus(String paymentStatus) 
+    {
+        this.paymentStatus = paymentStatus;
+    }
+
+    public String getPaymentStatus() 
+    {
+        return paymentStatus;
+    }
+    public void setDeliveryAddress(String deliveryAddress) 
+    {
+        this.deliveryAddress = deliveryAddress;
+    }
+
+    public String getDeliveryAddress() 
+    {
+        return deliveryAddress;
+    }
+    public void setExpectedDeliveryDate(Date expectedDeliveryDate) 
+    {
+        this.expectedDeliveryDate = expectedDeliveryDate;
+    }
+
+    public Date getExpectedDeliveryDate() 
+    {
+        return expectedDeliveryDate;
+    }
+    public void setActualDeliveryDate(Date actualDeliveryDate) 
+    {
+        this.actualDeliveryDate = actualDeliveryDate;
+    }
+
+    public Date getActualDeliveryDate() 
+    {
+        return actualDeliveryDate;
+    }
+    public void setShippingMethod(String shippingMethod) 
+    {
+        this.shippingMethod = shippingMethod;
+    }
+
+    public String getShippingMethod() 
+    {
+        return shippingMethod;
+    }
+    public void setShippingCost(BigDecimal shippingCost) 
+    {
+        this.shippingCost = shippingCost;
+    }
+
+    public BigDecimal getShippingCost() 
+    {
+        return shippingCost;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setInitiatorId(Long initiatorId) 
+    {
+        this.initiatorId = initiatorId;
+    }
+
+    public Long getInitiatorId() 
+    {
+        return initiatorId;
+    }
+    public void setInitiateDate(Date initiateDate) 
+    {
+        this.initiateDate = initiateDate;
+    }
+
+    public Date getInitiateDate() 
+    {
+        return initiateDate;
+    }
+    public void setApproverId(Long approverId) 
+    {
+        this.approverId = approverId;
+    }
+
+    public Long getApproverId() 
+    {
+        return approverId;
+    }
+    public void setApprovalDate(Date approvalDate) 
+    {
+        this.approvalDate = approvalDate;
+    }
+
+    public Date getApprovalDate() 
+    {
+        return approvalDate;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+    public void setCreatedDate(Date createdDate) 
+    {
+        this.createdDate = createdDate;
+    }
+
+    public Date getCreatedDate() 
+    {
+        return createdDate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("orderNo", getOrderNo())
+            .append("title", getTitle())
+            .append("vendorId", getVendorId())
+            .append("vendorName", getVendorName())
+            .append("vendorContact", getVendorContact())
+            .append("vendorPhone", getVendorPhone())
+            .append("materialId", getMaterialId())
+            .append("materialName", getMaterialName())
+            .append("specs", getSpecs())
+            .append("unit", getUnit())
+            .append("quantity", getQuantity())
+            .append("unitPrice", getUnitPrice())
+            .append("orderAmount", getOrderAmount())
+            .append("tax", getTax())
+            .append("totalAmount", getTotalAmount())
+            .append("paymentTerms", getPaymentTerms())
+            .append("paymentStatus", getPaymentStatus())
+            .append("deliveryAddress", getDeliveryAddress())
+            .append("expectedDeliveryDate", getExpectedDeliveryDate())
+            .append("actualDeliveryDate", getActualDeliveryDate())
+            .append("shippingMethod", getShippingMethod())
+            .append("shippingCost", getShippingCost())
+            .append("status", getStatus())
+            .append("initiatorId", getInitiatorId())
+            .append("initiateDate", getInitiateDate())
+            .append("approverId", getApproverId())
+            .append("approvalDate", getApprovalDate())
+            .append("remarks", getRemarks())
+            .append("createdDate", getCreatedDate())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/cg/mapper/InquiryQuotationMapper.java

@@ -0,0 +1,63 @@
+package com.ktg.mes.cg.mapper;
+
+import com.ktg.mes.cg.domain.InquiryQuotation;
+
+import java.util.List;
+
+
+/**
+ * 询报比价Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-24
+ */
+public interface InquiryQuotationMapper 
+{
+    /**
+     * 查询询报比价
+     * 
+     * @param id 询报比价主键
+     * @return 询报比价
+     */
+    public InquiryQuotation selectInquiryQuotationById(Long id);
+
+    /**
+     * 查询询报比价列表
+     * 
+     * @param inquiryQuotation 询报比价
+     * @return 询报比价集合
+     */
+    public List<InquiryQuotation> selectInquiryQuotationList(InquiryQuotation inquiryQuotation);
+
+    /**
+     * 新增询报比价
+     * 
+     * @param inquiryQuotation 询报比价
+     * @return 结果
+     */
+    public int insertInquiryQuotation(InquiryQuotation inquiryQuotation);
+
+    /**
+     * 修改询报比价
+     * 
+     * @param inquiryQuotation 询报比价
+     * @return 结果
+     */
+    public int updateInquiryQuotation(InquiryQuotation inquiryQuotation);
+
+    /**
+     * 删除询报比价
+     * 
+     * @param id 询报比价主键
+     * @return 结果
+     */
+    public int deleteInquiryQuotationById(Long id);
+
+    /**
+     * 批量删除询报比价
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteInquiryQuotationByIds(Long[] ids);
+}

ktg-mes/src/main/java/com/ktg/mes/cg/mapper/ProcurementPlanMapper.java

@@ -0,0 +1,63 @@
+package com.ktg.mes.cg.mapper;
+
+import com.ktg.mes.cg.domain.ProcurementPlan;
+
+import java.util.List;
+
+
+/**
+ * 采购计划Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-24
+ */
+public interface ProcurementPlanMapper 
+{
+    /**
+     * 查询采购计划
+     * 
+     * @param id 采购计划主键
+     * @return 采购计划
+     */
+    public ProcurementPlan selectProcurementPlanById(Long id);
+
+    /**
+     * 查询采购计划列表
+     * 
+     * @param procurementPlan 采购计划
+     * @return 采购计划集合
+     */
+    public List<ProcurementPlan> selectProcurementPlanList(ProcurementPlan procurementPlan);
+
+    /**
+     * 新增采购计划
+     * 
+     * @param procurementPlan 采购计划
+     * @return 结果
+     */
+    public int insertProcurementPlan(ProcurementPlan procurementPlan);
+
+    /**
+     * 修改采购计划
+     * 
+     * @param procurementPlan 采购计划
+     * @return 结果
+     */
+    public int updateProcurementPlan(ProcurementPlan procurementPlan);
+
+    /**
+     * 删除采购计划
+     * 
+     * @param id 采购计划主键
+     * @return 结果
+     */
+    public int deleteProcurementPlanById(Long id);
+
+    /**
+     * 批量删除采购计划
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteProcurementPlanByIds(Long[] ids);
+}

ktg-mes/src/main/java/com/ktg/mes/cg/mapper/PurchaseOrderMapper.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.mapper;
+
+import java.util.List;
+import com.ktg.mes.md.domain.PurchaseOrder;
+
+/**
+ * 采购订单Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-24
+ */
+public interface PurchaseOrderMapper 
+{
+    /**
+     * 查询采购订单
+     * 
+     * @param id 采购订单主键
+     * @return 采购订单
+     */
+    public PurchaseOrder selectPurchaseOrderById(Long id);
+
+    /**
+     * 查询采购订单列表
+     * 
+     * @param purchaseOrder 采购订单
+     * @return 采购订单集合
+     */
+    public List<PurchaseOrder> selectPurchaseOrderList(PurchaseOrder purchaseOrder);
+
+    /**
+     * 新增采购订单
+     * 
+     * @param purchaseOrder 采购订单
+     * @return 结果
+     */
+    public int insertPurchaseOrder(PurchaseOrder purchaseOrder);
+
+    /**
+     * 修改采购订单
+     * 
+     * @param purchaseOrder 采购订单
+     * @return 结果
+     */
+    public int updatePurchaseOrder(PurchaseOrder purchaseOrder);
+
+    /**
+     * 删除采购订单
+     * 
+     * @param id 采购订单主键
+     * @return 结果
+     */
+    public int deletePurchaseOrderById(Long id);
+
+    /**
+     * 批量删除采购订单
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deletePurchaseOrderByIds(Long[] ids);
+}

ktg-mes/src/main/java/com/ktg/mes/cg/service/IInquiryQuotationService.java

@@ -0,0 +1,63 @@
+package com.ktg.mes.cg.service;
+
+import com.ktg.mes.cg.domain.InquiryQuotation;
+
+import java.util.List;
+
+
+/**
+ * 询报比价Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-24
+ */
+public interface IInquiryQuotationService 
+{
+    /**
+     * 查询询报比价
+     * 
+     * @param id 询报比价主键
+     * @return 询报比价
+     */
+    public InquiryQuotation selectInquiryQuotationById(Long id);
+
+    /**
+     * 查询询报比价列表
+     * 
+     * @param inquiryQuotation 询报比价
+     * @return 询报比价集合
+     */
+    public List<InquiryQuotation> selectInquiryQuotationList(InquiryQuotation inquiryQuotation);
+
+    /**
+     * 新增询报比价
+     * 
+     * @param inquiryQuotation 询报比价
+     * @return 结果
+     */
+    public int insertInquiryQuotation(InquiryQuotation inquiryQuotation);
+
+    /**
+     * 修改询报比价
+     * 
+     * @param inquiryQuotation 询报比价
+     * @return 结果
+     */
+    public int updateInquiryQuotation(InquiryQuotation inquiryQuotation);
+
+    /**
+     * 批量删除询报比价
+     * 
+     * @param ids 需要删除的询报比价主键集合
+     * @return 结果
+     */
+    public int deleteInquiryQuotationByIds(Long[] ids);
+
+    /**
+     * 删除询报比价信息
+     * 
+     * @param id 询报比价主键
+     * @return 结果
+     */
+    public int deleteInquiryQuotationById(Long id);
+}

ktg-mes/src/main/java/com/ktg/mes/cg/service/IProcurementPlanService.java

@@ -0,0 +1,63 @@
+package com.ktg.mes.cg.service;
+
+import com.ktg.mes.cg.domain.ProcurementPlan;
+
+import java.util.List;
+
+
+/**
+ * 采购计划Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-24
+ */
+public interface IProcurementPlanService 
+{
+    /**
+     * 查询采购计划
+     * 
+     * @param id 采购计划主键
+     * @return 采购计划
+     */
+    public ProcurementPlan selectProcurementPlanById(Long id);
+
+    /**
+     * 查询采购计划列表
+     * 
+     * @param procurementPlan 采购计划
+     * @return 采购计划集合
+     */
+    public List<ProcurementPlan> selectProcurementPlanList(ProcurementPlan procurementPlan);
+
+    /**
+     * 新增采购计划
+     * 
+     * @param procurementPlan 采购计划
+     * @return 结果
+     */
+    public int insertProcurementPlan(ProcurementPlan procurementPlan);
+
+    /**
+     * 修改采购计划
+     * 
+     * @param procurementPlan 采购计划
+     * @return 结果
+     */
+    public int updateProcurementPlan(ProcurementPlan procurementPlan);
+
+    /**
+     * 批量删除采购计划
+     * 
+     * @param ids 需要删除的采购计划主键集合
+     * @return 结果
+     */
+    public int deleteProcurementPlanByIds(Long[] ids);
+
+    /**
+     * 删除采购计划信息
+     * 
+     * @param id 采购计划主键
+     * @return 结果
+     */
+    public int deleteProcurementPlanById(Long id);
+}

ktg-mes/src/main/java/com/ktg/mes/cg/service/IPurchaseOrderService.java

@@ -0,0 +1,61 @@
+package com.ktg.mes.md.service;
+
+import java.util.List;
+import com.ktg.mes.md.domain.PurchaseOrder;
+
+/**
+ * 采购订单Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-24
+ */
+public interface IPurchaseOrderService 
+{
+    /**
+     * 查询采购订单
+     * 
+     * @param id 采购订单主键
+     * @return 采购订单
+     */
+    public PurchaseOrder selectPurchaseOrderById(Long id);
+
+    /**
+     * 查询采购订单列表
+     * 
+     * @param purchaseOrder 采购订单
+     * @return 采购订单集合
+     */
+    public List<PurchaseOrder> selectPurchaseOrderList(PurchaseOrder purchaseOrder);
+
+    /**
+     * 新增采购订单
+     * 
+     * @param purchaseOrder 采购订单
+     * @return 结果
+     */
+    public int insertPurchaseOrder(PurchaseOrder purchaseOrder);
+
+    /**
+     * 修改采购订单
+     * 
+     * @param purchaseOrder 采购订单
+     * @return 结果
+     */
+    public int updatePurchaseOrder(PurchaseOrder purchaseOrder);
+
+    /**
+     * 批量删除采购订单
+     * 
+     * @param ids 需要删除的采购订单主键集合
+     * @return 结果
+     */
+    public int deletePurchaseOrderByIds(Long[] ids);
+
+    /**
+     * 删除采购订单信息
+     * 
+     * @param id 采购订单主键
+     * @return 结果
+     */
+    public int deletePurchaseOrderById(Long id);
+}

ktg-mes/src/main/java/com/ktg/mes/cg/service/impl/InquiryQuotationServiceImpl.java

@@ -0,0 +1,95 @@
+package com.ktg.mes.cg.service.impl;
+
+import java.util.List;
+
+import com.ktg.mes.cg.domain.InquiryQuotation;
+import com.ktg.mes.cg.mapper.InquiryQuotationMapper;
+import com.ktg.mes.cg.service.IInquiryQuotationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 询报比价Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-24
+ */
+@Service
+public class InquiryQuotationServiceImpl implements IInquiryQuotationService
+{
+    @Autowired
+    private InquiryQuotationMapper inquiryQuotationMapper;
+
+    /**
+     * 查询询报比价
+     * 
+     * @param id 询报比价主键
+     * @return 询报比价
+     */
+    @Override
+    public InquiryQuotation selectInquiryQuotationById(Long id)
+    {
+        return inquiryQuotationMapper.selectInquiryQuotationById(id);
+    }
+
+    /**
+     * 查询询报比价列表
+     * 
+     * @param inquiryQuotation 询报比价
+     * @return 询报比价
+     */
+    @Override
+    public List<InquiryQuotation> selectInquiryQuotationList(InquiryQuotation inquiryQuotation)
+    {
+        return inquiryQuotationMapper.selectInquiryQuotationList(inquiryQuotation);
+    }
+
+    /**
+     * 新增询报比价
+     * 
+     * @param inquiryQuotation 询报比价
+     * @return 结果
+     */
+    @Override
+    public int insertInquiryQuotation(InquiryQuotation inquiryQuotation)
+    {
+        return inquiryQuotationMapper.insertInquiryQuotation(inquiryQuotation);
+    }
+
+    /**
+     * 修改询报比价
+     * 
+     * @param inquiryQuotation 询报比价
+     * @return 结果
+     */
+    @Override
+    public int updateInquiryQuotation(InquiryQuotation inquiryQuotation)
+    {
+        return inquiryQuotationMapper.updateInquiryQuotation(inquiryQuotation);
+    }
+
+    /**
+     * 批量删除询报比价
+     * 
+     * @param ids 需要删除的询报比价主键
+     * @return 结果
+     */
+    @Override
+    public int deleteInquiryQuotationByIds(Long[] ids)
+    {
+        return inquiryQuotationMapper.deleteInquiryQuotationByIds(ids);
+    }
+
+    /**
+     * 删除询报比价信息
+     * 
+     * @param id 询报比价主键
+     * @return 结果
+     */
+    @Override
+    public int deleteInquiryQuotationById(Long id)
+    {
+        return inquiryQuotationMapper.deleteInquiryQuotationById(id);
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/cg/service/impl/ProcurementPlanServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ktg.mes.cg.service.impl;
+
+import com.ktg.mes.cg.domain.ProcurementPlan;
+import com.ktg.mes.cg.mapper.ProcurementPlanMapper;
+import com.ktg.mes.cg.service.IProcurementPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 采购计划Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-24
+ */
+@Service
+public class ProcurementPlanServiceImpl implements IProcurementPlanService
+{
+    @Autowired
+    private ProcurementPlanMapper procurementPlanMapper;
+
+    /**
+     * 查询采购计划
+     * 
+     * @param id 采购计划主键
+     * @return 采购计划
+     */
+    @Override
+    public ProcurementPlan selectProcurementPlanById(Long id)
+    {
+        return procurementPlanMapper.selectProcurementPlanById(id);
+    }
+
+    /**
+     * 查询采购计划列表
+     * 
+     * @param procurementPlan 采购计划
+     * @return 采购计划
+     */
+    @Override
+    public List<ProcurementPlan> selectProcurementPlanList(ProcurementPlan procurementPlan)
+    {
+        return procurementPlanMapper.selectProcurementPlanList(procurementPlan);
+    }
+
+    /**
+     * 新增采购计划
+     * 
+     * @param procurementPlan 采购计划
+     * @return 结果
+     */
+    @Override
+    public int insertProcurementPlan(ProcurementPlan procurementPlan)
+    {
+        return procurementPlanMapper.insertProcurementPlan(procurementPlan);
+    }
+
+    /**
+     * 修改采购计划
+     * 
+     * @param procurementPlan 采购计划
+     * @return 结果
+     */
+    @Override
+    public int updateProcurementPlan(ProcurementPlan procurementPlan)
+    {
+        return procurementPlanMapper.updateProcurementPlan(procurementPlan);
+    }
+
+    /**
+     * 批量删除采购计划
+     * 
+     * @param ids 需要删除的采购计划主键
+     * @return 结果
+     */
+    @Override
+    public int deleteProcurementPlanByIds(Long[] ids)
+    {
+        return procurementPlanMapper.deleteProcurementPlanByIds(ids);
+    }
+
+    /**
+     * 删除采购计划信息
+     * 
+     * @param id 采购计划主键
+     * @return 结果
+     */
+    @Override
+    public int deleteProcurementPlanById(Long id)
+    {
+        return procurementPlanMapper.deleteProcurementPlanById(id);
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/cg/service/impl/PurchaseOrderServiceImpl.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.PurchaseOrderMapper;
+import com.ktg.mes.md.domain.PurchaseOrder;
+import com.ktg.mes.md.service.IPurchaseOrderService;
+
+/**
+ * 采购订单Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-24
+ */
+@Service
+public class PurchaseOrderServiceImpl implements IPurchaseOrderService 
+{
+    @Autowired
+    private PurchaseOrderMapper purchaseOrderMapper;
+
+    /**
+     * 查询采购订单
+     * 
+     * @param id 采购订单主键
+     * @return 采购订单
+     */
+    @Override
+    public PurchaseOrder selectPurchaseOrderById(Long id)
+    {
+        return purchaseOrderMapper.selectPurchaseOrderById(id);
+    }
+
+    /**
+     * 查询采购订单列表
+     * 
+     * @param purchaseOrder 采购订单
+     * @return 采购订单
+     */
+    @Override
+    public List<PurchaseOrder> selectPurchaseOrderList(PurchaseOrder purchaseOrder)
+    {
+        return purchaseOrderMapper.selectPurchaseOrderList(purchaseOrder);
+    }
+
+    /**
+     * 新增采购订单
+     * 
+     * @param purchaseOrder 采购订单
+     * @return 结果
+     */
+    @Override
+    public int insertPurchaseOrder(PurchaseOrder purchaseOrder)
+    {
+        return purchaseOrderMapper.insertPurchaseOrder(purchaseOrder);
+    }
+
+    /**
+     * 修改采购订单
+     * 
+     * @param purchaseOrder 采购订单
+     * @return 结果
+     */
+    @Override
+    public int updatePurchaseOrder(PurchaseOrder purchaseOrder)
+    {
+        return purchaseOrderMapper.updatePurchaseOrder(purchaseOrder);
+    }
+
+    /**
+     * 批量删除采购订单
+     * 
+     * @param ids 需要删除的采购订单主键
+     * @return 结果
+     */
+    @Override
+    public int deletePurchaseOrderByIds(Long[] ids)
+    {
+        return purchaseOrderMapper.deletePurchaseOrderByIds(ids);
+    }
+
+    /**
+     * 删除采购订单信息
+     * 
+     * @param id 采购订单主键
+     * @return 结果
+     */
+    @Override
+    public int deletePurchaseOrderById(Long id)
+    {
+        return purchaseOrderMapper.deletePurchaseOrderById(id);
+    }
+}

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/gys/controller/SupplierAssessmentController.java

@@ -0,0 +1,98 @@
+package com.ktg.mes.gys.controller;
+
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.core.domain.AjaxResult;
+import com.ktg.common.core.page.TableDataInfo;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.mes.gys.domain.SupplierAssessment;
+import com.ktg.mes.gys.service.ISupplierAssessmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 供应商评估Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@RestController
+@RequestMapping("/md/assessment")
+public class SupplierAssessmentController extends BaseController
+{
+    @Autowired
+    private ISupplierAssessmentService supplierAssessmentService;
+
+    /**
+     * 查询供应商评估列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:assessment:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SupplierAssessment supplierAssessment)
+    {
+        startPage();
+        List<SupplierAssessment> list = supplierAssessmentService.selectSupplierAssessmentList(supplierAssessment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出供应商评估列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:assessment:export')")
+    @Log(title = "供应商评估", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SupplierAssessment supplierAssessment)
+    {
+        List<SupplierAssessment> list = supplierAssessmentService.selectSupplierAssessmentList(supplierAssessment);
+        ExcelUtil<SupplierAssessment> util = new ExcelUtil<SupplierAssessment>(SupplierAssessment.class);
+        util.exportExcel(response, list, "供应商评估数据");
+    }
+
+    /**
+     * 获取供应商评估详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:assessment:query')")
+    @GetMapping(value = "/{assessmentId}")
+    public AjaxResult getInfo(@PathVariable("assessmentId") Long assessmentId)
+    {
+        return AjaxResult.success(supplierAssessmentService.selectSupplierAssessmentByAssessmentId(assessmentId));
+    }
+
+    /**
+     * 新增供应商评估
+     */
+    @PreAuthorize("@ss.hasPermi('md:assessment:add')")
+    @Log(title = "供应商评估", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SupplierAssessment supplierAssessment)
+    {
+        return toAjax(supplierAssessmentService.insertSupplierAssessment(supplierAssessment));
+    }
+
+    /**
+     * 修改供应商评估
+     */
+    @PreAuthorize("@ss.hasPermi('md:assessment:edit')")
+    @Log(title = "供应商评估", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SupplierAssessment supplierAssessment)
+    {
+        return toAjax(supplierAssessmentService.updateSupplierAssessment(supplierAssessment));
+    }
+
+    /**
+     * 删除供应商评估
+     */
+    @PreAuthorize("@ss.hasPermi('md:assessment:remove')")
+    @Log(title = "供应商评估", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{assessmentIds}")
+    public AjaxResult remove(@PathVariable Long[] assessmentIds)
+    {
+        return toAjax(supplierAssessmentService.deleteSupplierAssessmentByAssessmentIds(assessmentIds));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/gys/controller/SupplierCategoryController.java

@@ -0,0 +1,106 @@
+package com.ktg.mes.gys.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.mes.gys.domain.SupplierCategory;
+import com.ktg.mes.gys.service.ISupplierCategoryService;
+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.common.core.page.TableDataInfo;
+
+/**
+ * 供应商类别Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@RestController
+@RequestMapping("/md/category")
+public class SupplierCategoryController extends BaseController
+{
+    @Autowired
+    private ISupplierCategoryService supplierCategoryService;
+
+    /**
+     * 查询供应商类别列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:category:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SupplierCategory supplierCategory)
+    {
+        startPage();
+        List<SupplierCategory> list = supplierCategoryService.selectSupplierCategoryList(supplierCategory);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出供应商类别列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:category:export')")
+    @Log(title = "供应商类别", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SupplierCategory supplierCategory)
+    {
+        List<SupplierCategory> list = supplierCategoryService.selectSupplierCategoryList(supplierCategory);
+        ExcelUtil<SupplierCategory> util = new ExcelUtil<SupplierCategory>(SupplierCategory.class);
+        util.exportExcel(response, list, "供应商类别数据");
+    }
+
+    /**
+     * 获取供应商类别详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:category:query')")
+    @GetMapping(value = "/{categoryId}")
+    public AjaxResult getInfo(@PathVariable("categoryId") Long categoryId)
+    {
+        return AjaxResult.success(supplierCategoryService.selectSupplierCategoryByCategoryId(categoryId));
+    }
+
+    /**
+     * 新增供应商类别
+     */
+    @PreAuthorize("@ss.hasPermi('md:category:add')")
+    @Log(title = "供应商类别", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SupplierCategory supplierCategory)
+    {
+        return toAjax(supplierCategoryService.insertSupplierCategory(supplierCategory));
+    }
+
+    /**
+     * 修改供应商类别
+     */
+    @PreAuthorize("@ss.hasPermi('md:category:edit')")
+    @Log(title = "供应商类别", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SupplierCategory supplierCategory)
+    {
+        return toAjax(supplierCategoryService.updateSupplierCategory(supplierCategory));
+    }
+
+    /**
+     * 删除供应商类别
+     */
+    @PreAuthorize("@ss.hasPermi('md:category:remove')")
+    @Log(title = "供应商类别", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{categoryIds}")
+    public AjaxResult remove(@PathVariable Long[] categoryIds)
+    {
+        return toAjax(supplierCategoryService.deleteSupplierCategoryByCategoryIds(categoryIds));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/gys/controller/SupplierCooperationRecordController.java

@@ -0,0 +1,98 @@
+package com.ktg.mes.gys.controller;
+
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.core.domain.AjaxResult;
+import com.ktg.common.core.page.TableDataInfo;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.mes.gys.domain.SupplierCooperationRecord;
+import com.ktg.mes.gys.service.ISupplierCooperationRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 供应商合作记录Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@RestController
+@RequestMapping("/md/record")
+public class SupplierCooperationRecordController extends BaseController
+{
+    @Autowired
+    private ISupplierCooperationRecordService supplierCooperationRecordService;
+
+    /**
+     * 查询供应商合作记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:record:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SupplierCooperationRecord supplierCooperationRecord)
+    {
+        startPage();
+        List<SupplierCooperationRecord> list = supplierCooperationRecordService.selectSupplierCooperationRecordList(supplierCooperationRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出供应商合作记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:record:export')")
+    @Log(title = "供应商合作记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SupplierCooperationRecord supplierCooperationRecord)
+    {
+        List<SupplierCooperationRecord> list = supplierCooperationRecordService.selectSupplierCooperationRecordList(supplierCooperationRecord);
+        ExcelUtil<SupplierCooperationRecord> util = new ExcelUtil<SupplierCooperationRecord>(SupplierCooperationRecord.class);
+        util.exportExcel(response, list, "供应商合作记录数据");
+    }
+
+    /**
+     * 获取供应商合作记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:record:query')")
+    @GetMapping(value = "/{recordId}")
+    public AjaxResult getInfo(@PathVariable("recordId") Long recordId)
+    {
+        return AjaxResult.success(supplierCooperationRecordService.selectSupplierCooperationRecordByRecordId(recordId));
+    }
+
+    /**
+     * 新增供应商合作记录
+     */
+    @PreAuthorize("@ss.hasPermi('md:record:add')")
+    @Log(title = "供应商合作记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SupplierCooperationRecord supplierCooperationRecord)
+    {
+        return toAjax(supplierCooperationRecordService.insertSupplierCooperationRecord(supplierCooperationRecord));
+    }
+
+    /**
+     * 修改供应商合作记录
+     */
+    @PreAuthorize("@ss.hasPermi('md:record:edit')")
+    @Log(title = "供应商合作记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SupplierCooperationRecord supplierCooperationRecord)
+    {
+        return toAjax(supplierCooperationRecordService.updateSupplierCooperationRecord(supplierCooperationRecord));
+    }
+
+    /**
+     * 删除供应商合作记录
+     */
+    @PreAuthorize("@ss.hasPermi('md:record:remove')")
+    @Log(title = "供应商合作记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{recordIds}")
+    public AjaxResult remove(@PathVariable Long[] recordIds)
+    {
+        return toAjax(supplierCooperationRecordService.deleteSupplierCooperationRecordByRecordIds(recordIds));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/gys/controller/SupplierQualificationController.java

@@ -0,0 +1,105 @@
+package com.ktg.mes.gys.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.mes.gys.domain.SupplierQualification;
+import com.ktg.mes.gys.service.ISupplierQualificationService;
+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.common.core.page.TableDataInfo;
+
+/**
+ * 供应商资质Controller
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@RestController
+@RequestMapping("/md/qualification")
+public class SupplierQualificationController extends BaseController
+{
+    @Autowired
+    private ISupplierQualificationService supplierQualificationService;
+
+    /**
+     * 查询供应商资质列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:qualification:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SupplierQualification supplierQualification)
+    {
+        startPage();
+        List<SupplierQualification> list = supplierQualificationService.selectSupplierQualificationList(supplierQualification);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出供应商资质列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:qualification:export')")
+    @Log(title = "供应商资质", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SupplierQualification supplierQualification)
+    {
+        List<SupplierQualification> list = supplierQualificationService.selectSupplierQualificationList(supplierQualification);
+        ExcelUtil<SupplierQualification> util = new ExcelUtil<SupplierQualification>(SupplierQualification.class);
+        util.exportExcel(response, list, "供应商资质数据");
+    }
+
+    /**
+     * 获取供应商资质详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('md:qualification:query')")
+    @GetMapping(value = "/{qualId}")
+    public AjaxResult getInfo(@PathVariable("qualId") Long qualId)
+    {
+        return AjaxResult.success(supplierQualificationService.selectSupplierQualificationByQualId(qualId));
+    }
+
+    /**
+     * 新增供应商资质
+     */
+    @PreAuthorize("@ss.hasPermi('md:qualification:add')")
+    @Log(title = "供应商资质", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SupplierQualification supplierQualification)
+    {
+        return toAjax(supplierQualificationService.insertSupplierQualification(supplierQualification));
+    }
+
+    /**
+     * 修改供应商资质
+     */
+    @PreAuthorize("@ss.hasPermi('md:qualification:edit')")
+    @Log(title = "供应商资质", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SupplierQualification supplierQualification)
+    {
+        return toAjax(supplierQualificationService.updateSupplierQualification(supplierQualification));
+    }
+
+    /**
+     * 删除供应商资质
+     */
+    @PreAuthorize("@ss.hasPermi('md:qualification:remove')")
+    @Log(title = "供应商资质", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{qualIds}")
+    public AjaxResult remove(@PathVariable Long[] qualIds)
+    {
+        return toAjax(supplierQualificationService.deleteSupplierQualificationByQualIds(qualIds));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/gys/domain/SupplierAssessment.java

@@ -0,0 +1,126 @@
+package com.ktg.mes.gys.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;
+
+/**
+ * 供应商评估对象 supplier_assessment
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public class SupplierAssessment extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 评估ID */
+    private Long assessmentId;
+
+    /** 供应商名称 */
+    @Excel(name = "供应商名称")
+    private String supplierName;
+
+    /** 供应商ID */
+    @Excel(name = "供应商ID")
+    private Long supplierId;
+
+    /** 评估时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "评估时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date assessmentTime;
+
+    /** 评分 */
+    @Excel(name = "评分")
+    private String score;
+
+    /** 评估备注 */
+    @Excel(name = "评估备注")
+    private String remarks;
+
+    /** 删除标记，0未删除，1已删除 */
+    @Excel(name = "删除标记，0未删除，1已删除")
+    private String isDeleted;
+
+    public void setAssessmentId(Long assessmentId) 
+    {
+        this.assessmentId = assessmentId;
+    }
+
+    public Long getAssessmentId() 
+    {
+        return assessmentId;
+    }
+    public void setSupplierName(String supplierName) 
+    {
+        this.supplierName = supplierName;
+    }
+
+    public String getSupplierName() 
+    {
+        return supplierName;
+    }
+    public void setSupplierId(Long supplierId) 
+    {
+        this.supplierId = supplierId;
+    }
+
+    public Long getSupplierId() 
+    {
+        return supplierId;
+    }
+    public void setAssessmentTime(Date assessmentTime) 
+    {
+        this.assessmentTime = assessmentTime;
+    }
+
+    public Date getAssessmentTime() 
+    {
+        return assessmentTime;
+    }
+    public void setScore(String score) 
+    {
+        this.score = score;
+    }
+
+    public String getScore() 
+    {
+        return score;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+    public void setIsDeleted(String isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public String getIsDeleted() 
+    {
+        return isDeleted;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("assessmentId", getAssessmentId())
+            .append("supplierName", getSupplierName())
+            .append("supplierId", getSupplierId())
+            .append("assessmentTime", getAssessmentTime())
+            .append("score", getScore())
+            .append("remarks", getRemarks())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDeleted", getIsDeleted())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/gys/domain/SupplierCategory.java

@@ -0,0 +1,81 @@
+package com.ktg.mes.gys.domain;
+
+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;
+
+/**
+ * 供应商类别对象 supplier_category
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public class SupplierCategory extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 类别ID */
+    private Long categoryId;
+
+    /** 类别名称 */
+    @Excel(name = "类别名称")
+    private String categoryName;
+
+    /** 类别描述 */
+    @Excel(name = "类别描述")
+    private String description;
+
+    /** 删除标记，0未删除，1已删除 */
+    @Excel(name = "删除标记，0未删除，1已删除")
+    private String isDeleted;
+
+    public void setCategoryId(Long categoryId) 
+    {
+        this.categoryId = categoryId;
+    }
+
+    public Long getCategoryId() 
+    {
+        return categoryId;
+    }
+    public void setCategoryName(String categoryName) 
+    {
+        this.categoryName = categoryName;
+    }
+
+    public String getCategoryName() 
+    {
+        return categoryName;
+    }
+    public void setDescription(String description) 
+    {
+        this.description = description;
+    }
+
+    public String getDescription() 
+    {
+        return description;
+    }
+    public void setIsDeleted(String isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public String getIsDeleted() 
+    {
+        return isDeleted;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("categoryId", getCategoryId())
+            .append("categoryName", getCategoryName())
+            .append("description", getDescription())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDeleted", getIsDeleted())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/gys/domain/SupplierCooperationRecord.java

@@ -0,0 +1,140 @@
+package com.ktg.mes.gys.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;
+
+/**
+ * 供应商合作记录对象 supplier_cooperation_record
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public class SupplierCooperationRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 记录ID */
+    private Long recordId;
+
+    /** 供应商名称 */
+    @Excel(name = "供应商名称")
+    private String supplierName;
+
+    /** 供应商ID */
+    @Excel(name = "供应商ID")
+    private Long supplierId;
+
+    /** 合作时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "合作时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date cooperationTime;
+
+    /** 	合作内容 */
+    @Excel(name = "	合作内容")
+    private String content;
+
+    /** 	合作金额 */
+    @Excel(name = "	合作金额")
+    private Long amount;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 删除标记，0未删除，1已删除 */
+    @Excel(name = "删除标记，0未删除，1已删除")
+    private String isDeleted;
+
+    public void setRecordId(Long recordId) 
+    {
+        this.recordId = recordId;
+    }
+
+    public Long getRecordId() 
+    {
+        return recordId;
+    }
+    public void setSupplierName(String supplierName) 
+    {
+        this.supplierName = supplierName;
+    }
+
+    public String getSupplierName() 
+    {
+        return supplierName;
+    }
+    public void setSupplierId(Long supplierId) 
+    {
+        this.supplierId = supplierId;
+    }
+
+    public Long getSupplierId() 
+    {
+        return supplierId;
+    }
+    public void setCooperationTime(Date cooperationTime) 
+    {
+        this.cooperationTime = cooperationTime;
+    }
+
+    public Date getCooperationTime() 
+    {
+        return cooperationTime;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setAmount(Long amount) 
+    {
+        this.amount = amount;
+    }
+
+    public Long getAmount() 
+    {
+        return amount;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+    public void setIsDeleted(String isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public String getIsDeleted() 
+    {
+        return isDeleted;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("recordId", getRecordId())
+            .append("supplierName", getSupplierName())
+            .append("supplierId", getSupplierId())
+            .append("cooperationTime", getCooperationTime())
+            .append("content", getContent())
+            .append("amount", getAmount())
+            .append("remarks", getRemarks())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDeleted", getIsDeleted())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/gys/domain/SupplierQualification.java

@@ -0,0 +1,126 @@
+package com.ktg.mes.gys.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;
+
+/**
+ * 供应商资质对象 supplier_qualification
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public class SupplierQualification extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 资质ID */
+    private Long qualId;
+
+    /** 供应商ID */
+    @Excel(name = "供应商ID")
+    private Long supplierId;
+
+    /** 资质名称 */
+    @Excel(name = "资质名称")
+    private String qualName;
+
+    /** 资质类型 */
+    @Excel(name = "资质类型")
+    private String qualType;
+
+    /** 有效期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date validDate;
+
+    /** 附件 */
+    @Excel(name = "附件")
+    private String filePath;
+
+    /** 删除标记，0未删除，1已删除 */
+    @Excel(name = "删除标记，0未删除，1已删除")
+    private String isDeleted;
+
+    public void setQualId(Long qualId) 
+    {
+        this.qualId = qualId;
+    }
+
+    public Long getQualId() 
+    {
+        return qualId;
+    }
+    public void setSupplierId(Long supplierId) 
+    {
+        this.supplierId = supplierId;
+    }
+
+    public Long getSupplierId() 
+    {
+        return supplierId;
+    }
+    public void setQualName(String qualName) 
+    {
+        this.qualName = qualName;
+    }
+
+    public String getQualName() 
+    {
+        return qualName;
+    }
+    public void setQualType(String qualType) 
+    {
+        this.qualType = qualType;
+    }
+
+    public String getQualType() 
+    {
+        return qualType;
+    }
+    public void setValidDate(Date validDate) 
+    {
+        this.validDate = validDate;
+    }
+
+    public Date getValidDate() 
+    {
+        return validDate;
+    }
+    public void setFilePath(String filePath) 
+    {
+        this.filePath = filePath;
+    }
+
+    public String getFilePath() 
+    {
+        return filePath;
+    }
+    public void setIsDeleted(String isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public String getIsDeleted() 
+    {
+        return isDeleted;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("qualId", getQualId())
+            .append("supplierId", getSupplierId())
+            .append("qualName", getQualName())
+            .append("qualType", getQualType())
+            .append("validDate", getValidDate())
+            .append("filePath", getFilePath())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDeleted", getIsDeleted())
+            .toString();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/gys/mapper/SupplierAssessmentMapper.java

@@ -0,0 +1,63 @@
+package com.ktg.mes.gys.mapper;
+
+import com.ktg.mes.gys.domain.SupplierAssessment;
+
+import java.util.List;
+
+
+/**
+ * 供应商评估Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface SupplierAssessmentMapper 
+{
+    /**
+     * 查询供应商评估
+     * 
+     * @param assessmentId 供应商评估主键
+     * @return 供应商评估
+     */
+    public SupplierAssessment selectSupplierAssessmentByAssessmentId(Long assessmentId);
+
+    /**
+     * 查询供应商评估列表
+     * 
+     * @param supplierAssessment 供应商评估
+     * @return 供应商评估集合
+     */
+    public List<SupplierAssessment> selectSupplierAssessmentList(SupplierAssessment supplierAssessment);
+
+    /**
+     * 新增供应商评估
+     * 
+     * @param supplierAssessment 供应商评估
+     * @return 结果
+     */
+    public int insertSupplierAssessment(SupplierAssessment supplierAssessment);
+
+    /**
+     * 修改供应商评估
+     * 
+     * @param supplierAssessment 供应商评估
+     * @return 结果
+     */
+    public int updateSupplierAssessment(SupplierAssessment supplierAssessment);
+
+    /**
+     * 删除供应商评估
+     * 
+     * @param assessmentId 供应商评估主键
+     * @return 结果
+     */
+    public int deleteSupplierAssessmentByAssessmentId(Long assessmentId);
+
+    /**
+     * 批量删除供应商评估
+     * 
+     * @param assessmentIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSupplierAssessmentByAssessmentIds(Long[] assessmentIds);
+}

ktg-mes/src/main/java/com/ktg/mes/gys/mapper/SupplierCategoryMapper.java

@@ -0,0 +1,63 @@
+package com.ktg.mes.gys.mapper;
+
+import com.ktg.mes.gys.domain.SupplierCategory;
+
+import java.util.List;
+
+
+/**
+ * 供应商类别Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface SupplierCategoryMapper 
+{
+    /**
+     * 查询供应商类别
+     * 
+     * @param categoryId 供应商类别主键
+     * @return 供应商类别
+     */
+    public SupplierCategory selectSupplierCategoryByCategoryId(Long categoryId);
+
+    /**
+     * 查询供应商类别列表
+     * 
+     * @param supplierCategory 供应商类别
+     * @return 供应商类别集合
+     */
+    public List<SupplierCategory> selectSupplierCategoryList(SupplierCategory supplierCategory);
+
+    /**
+     * 新增供应商类别
+     * 
+     * @param supplierCategory 供应商类别
+     * @return 结果
+     */
+    public int insertSupplierCategory(SupplierCategory supplierCategory);
+
+    /**
+     * 修改供应商类别
+     * 
+     * @param supplierCategory 供应商类别
+     * @return 结果
+     */
+    public int updateSupplierCategory(SupplierCategory supplierCategory);
+
+    /**
+     * 删除供应商类别
+     * 
+     * @param categoryId 供应商类别主键
+     * @return 结果
+     */
+    public int deleteSupplierCategoryByCategoryId(Long categoryId);
+
+    /**
+     * 批量删除供应商类别
+     * 
+     * @param categoryIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSupplierCategoryByCategoryIds(Long[] categoryIds);
+}

ktg-mes/src/main/java/com/ktg/mes/gys/mapper/SupplierCooperationRecordMapper.java

@@ -0,0 +1,63 @@
+package com.ktg.mes.gys.mapper;
+
+import com.ktg.mes.gys.domain.SupplierCooperationRecord;
+
+import java.util.List;
+
+
+/**
+ * 供应商合作记录Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface SupplierCooperationRecordMapper 
+{
+    /**
+     * 查询供应商合作记录
+     * 
+     * @param recordId 供应商合作记录主键
+     * @return 供应商合作记录
+     */
+    public SupplierCooperationRecord selectSupplierCooperationRecordByRecordId(Long recordId);
+
+    /**
+     * 查询供应商合作记录列表
+     * 
+     * @param supplierCooperationRecord 供应商合作记录
+     * @return 供应商合作记录集合
+     */
+    public List<SupplierCooperationRecord> selectSupplierCooperationRecordList(SupplierCooperationRecord supplierCooperationRecord);
+
+    /**
+     * 新增供应商合作记录
+     * 
+     * @param supplierCooperationRecord 供应商合作记录
+     * @return 结果
+     */
+    public int insertSupplierCooperationRecord(SupplierCooperationRecord supplierCooperationRecord);
+
+    /**
+     * 修改供应商合作记录
+     * 
+     * @param supplierCooperationRecord 供应商合作记录
+     * @return 结果
+     */
+    public int updateSupplierCooperationRecord(SupplierCooperationRecord supplierCooperationRecord);
+
+    /**
+     * 删除供应商合作记录
+     * 
+     * @param recordId 供应商合作记录主键
+     * @return 结果
+     */
+    public int deleteSupplierCooperationRecordByRecordId(Long recordId);
+
+    /**
+     * 批量删除供应商合作记录
+     * 
+     * @param recordIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSupplierCooperationRecordByRecordIds(Long[] recordIds);
+}

ktg-mes/src/main/java/com/ktg/mes/gys/mapper/SupplierQualificationMapper.java

@@ -0,0 +1,63 @@
+package com.ktg.mes.gys.mapper;
+
+import com.ktg.mes.gys.domain.SupplierQualification;
+
+import java.util.List;
+
+
+/**
+ * 供应商资质Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface SupplierQualificationMapper 
+{
+    /**
+     * 查询供应商资质
+     * 
+     * @param qualId 供应商资质主键
+     * @return 供应商资质
+     */
+    public SupplierQualification selectSupplierQualificationByQualId(Long qualId);
+
+    /**
+     * 查询供应商资质列表
+     * 
+     * @param supplierQualification 供应商资质
+     * @return 供应商资质集合
+     */
+    public List<SupplierQualification> selectSupplierQualificationList(SupplierQualification supplierQualification);
+
+    /**
+     * 新增供应商资质
+     * 
+     * @param supplierQualification 供应商资质
+     * @return 结果
+     */
+    public int insertSupplierQualification(SupplierQualification supplierQualification);
+
+    /**
+     * 修改供应商资质
+     * 
+     * @param supplierQualification 供应商资质
+     * @return 结果
+     */
+    public int updateSupplierQualification(SupplierQualification supplierQualification);
+
+    /**
+     * 删除供应商资质
+     * 
+     * @param qualId 供应商资质主键
+     * @return 结果
+     */
+    public int deleteSupplierQualificationByQualId(Long qualId);
+
+    /**
+     * 批量删除供应商资质
+     * 
+     * @param qualIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSupplierQualificationByQualIds(Long[] qualIds);
+}

ktg-mes/src/main/java/com/ktg/mes/gys/service/ISupplierAssessmentService.java

@@ -0,0 +1,63 @@
+package com.ktg.mes.gys.service;
+
+import com.ktg.mes.gys.domain.SupplierAssessment;
+
+import java.util.List;
+
+
+/**
+ * 供应商评估Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface ISupplierAssessmentService 
+{
+    /**
+     * 查询供应商评估
+     * 
+     * @param assessmentId 供应商评估主键
+     * @return 供应商评估
+     */
+    public SupplierAssessment selectSupplierAssessmentByAssessmentId(Long assessmentId);
+
+    /**
+     * 查询供应商评估列表
+     * 
+     * @param supplierAssessment 供应商评估
+     * @return 供应商评估集合
+     */
+    public List<SupplierAssessment> selectSupplierAssessmentList(SupplierAssessment supplierAssessment);
+
+    /**
+     * 新增供应商评估
+     * 
+     * @param supplierAssessment 供应商评估
+     * @return 结果
+     */
+    public int insertSupplierAssessment(SupplierAssessment supplierAssessment);
+
+    /**
+     * 修改供应商评估
+     * 
+     * @param supplierAssessment 供应商评估
+     * @return 结果
+     */
+    public int updateSupplierAssessment(SupplierAssessment supplierAssessment);
+
+    /**
+     * 批量删除供应商评估
+     * 
+     * @param assessmentIds 需要删除的供应商评估主键集合
+     * @return 结果
+     */
+    public int deleteSupplierAssessmentByAssessmentIds(Long[] assessmentIds);
+
+    /**
+     * 删除供应商评估信息
+     * 
+     * @param assessmentId 供应商评估主键
+     * @return 结果
+     */
+    public int deleteSupplierAssessmentByAssessmentId(Long assessmentId);
+}

ktg-mes/src/main/java/com/ktg/mes/gys/service/ISupplierCategoryService.java

@@ -0,0 +1,63 @@
+package com.ktg.mes.gys.service;
+
+import com.ktg.mes.gys.domain.SupplierCategory;
+
+import java.util.List;
+
+
+/**
+ * 供应商类别Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface ISupplierCategoryService 
+{
+    /**
+     * 查询供应商类别
+     * 
+     * @param categoryId 供应商类别主键
+     * @return 供应商类别
+     */
+    public SupplierCategory selectSupplierCategoryByCategoryId(Long categoryId);
+
+    /**
+     * 查询供应商类别列表
+     * 
+     * @param supplierCategory 供应商类别
+     * @return 供应商类别集合
+     */
+    public List<SupplierCategory> selectSupplierCategoryList(SupplierCategory supplierCategory);
+
+    /**
+     * 新增供应商类别
+     * 
+     * @param supplierCategory 供应商类别
+     * @return 结果
+     */
+    public int insertSupplierCategory(SupplierCategory supplierCategory);
+
+    /**
+     * 修改供应商类别
+     * 
+     * @param supplierCategory 供应商类别
+     * @return 结果
+     */
+    public int updateSupplierCategory(SupplierCategory supplierCategory);
+
+    /**
+     * 批量删除供应商类别
+     * 
+     * @param categoryIds 需要删除的供应商类别主键集合
+     * @return 结果
+     */
+    public int deleteSupplierCategoryByCategoryIds(Long[] categoryIds);
+
+    /**
+     * 删除供应商类别信息
+     * 
+     * @param categoryId 供应商类别主键
+     * @return 结果
+     */
+    public int deleteSupplierCategoryByCategoryId(Long categoryId);
+}

ktg-mes/src/main/java/com/ktg/mes/gys/service/ISupplierCooperationRecordService.java

@@ -0,0 +1,63 @@
+package com.ktg.mes.gys.service;
+
+import com.ktg.mes.gys.domain.SupplierCooperationRecord;
+
+import java.util.List;
+
+
+/**
+ * 供应商合作记录Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface ISupplierCooperationRecordService 
+{
+    /**
+     * 查询供应商合作记录
+     * 
+     * @param recordId 供应商合作记录主键
+     * @return 供应商合作记录
+     */
+    public SupplierCooperationRecord selectSupplierCooperationRecordByRecordId(Long recordId);
+
+    /**
+     * 查询供应商合作记录列表
+     * 
+     * @param supplierCooperationRecord 供应商合作记录
+     * @return 供应商合作记录集合
+     */
+    public List<SupplierCooperationRecord> selectSupplierCooperationRecordList(SupplierCooperationRecord supplierCooperationRecord);
+
+    /**
+     * 新增供应商合作记录
+     * 
+     * @param supplierCooperationRecord 供应商合作记录
+     * @return 结果
+     */
+    public int insertSupplierCooperationRecord(SupplierCooperationRecord supplierCooperationRecord);
+
+    /**
+     * 修改供应商合作记录
+     * 
+     * @param supplierCooperationRecord 供应商合作记录
+     * @return 结果
+     */
+    public int updateSupplierCooperationRecord(SupplierCooperationRecord supplierCooperationRecord);
+
+    /**
+     * 批量删除供应商合作记录
+     * 
+     * @param recordIds 需要删除的供应商合作记录主键集合
+     * @return 结果
+     */
+    public int deleteSupplierCooperationRecordByRecordIds(Long[] recordIds);
+
+    /**
+     * 删除供应商合作记录信息
+     * 
+     * @param recordId 供应商合作记录主键
+     * @return 结果
+     */
+    public int deleteSupplierCooperationRecordByRecordId(Long recordId);
+}

ktg-mes/src/main/java/com/ktg/mes/gys/service/ISupplierQualificationService.java

@@ -0,0 +1,63 @@
+package com.ktg.mes.gys.service;
+
+import com.ktg.mes.gys.domain.SupplierQualification;
+
+import java.util.List;
+
+
+/**
+ * 供应商资质Service接口
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+public interface ISupplierQualificationService 
+{
+    /**
+     * 查询供应商资质
+     * 
+     * @param qualId 供应商资质主键
+     * @return 供应商资质
+     */
+    public SupplierQualification selectSupplierQualificationByQualId(Long qualId);
+
+    /**
+     * 查询供应商资质列表
+     * 
+     * @param supplierQualification 供应商资质
+     * @return 供应商资质集合
+     */
+    public List<SupplierQualification> selectSupplierQualificationList(SupplierQualification supplierQualification);
+
+    /**
+     * 新增供应商资质
+     * 
+     * @param supplierQualification 供应商资质
+     * @return 结果
+     */
+    public int insertSupplierQualification(SupplierQualification supplierQualification);
+
+    /**
+     * 修改供应商资质
+     * 
+     * @param supplierQualification 供应商资质
+     * @return 结果
+     */
+    public int updateSupplierQualification(SupplierQualification supplierQualification);
+
+    /**
+     * 批量删除供应商资质
+     * 
+     * @param qualIds 需要删除的供应商资质主键集合
+     * @return 结果
+     */
+    public int deleteSupplierQualificationByQualIds(Long[] qualIds);
+
+    /**
+     * 删除供应商资质信息
+     * 
+     * @param qualId 供应商资质主键
+     * @return 结果
+     */
+    public int deleteSupplierQualificationByQualId(Long qualId);
+}

ktg-mes/src/main/java/com/ktg/mes/gys/service/impl/SupplierAssessmentServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ktg.mes.gys.service.impl;
+
+import java.util.List;
+import com.ktg.common.utils.DateUtils;
+import com.ktg.mes.gys.domain.SupplierAssessment;
+import com.ktg.mes.gys.mapper.SupplierAssessmentMapper;
+import com.ktg.mes.gys.service.ISupplierAssessmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 供应商评估Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@Service
+public class SupplierAssessmentServiceImpl implements ISupplierAssessmentService
+{
+    @Autowired
+    private SupplierAssessmentMapper supplierAssessmentMapper;
+
+    /**
+     * 查询供应商评估
+     * 
+     * @param assessmentId 供应商评估主键
+     * @return 供应商评估
+     */
+    @Override
+    public SupplierAssessment selectSupplierAssessmentByAssessmentId(Long assessmentId)
+    {
+        return supplierAssessmentMapper.selectSupplierAssessmentByAssessmentId(assessmentId);
+    }
+
+    /**
+     * 查询供应商评估列表
+     * 
+     * @param supplierAssessment 供应商评估
+     * @return 供应商评估
+     */
+    @Override
+    public List<SupplierAssessment> selectSupplierAssessmentList(SupplierAssessment supplierAssessment)
+    {
+        return supplierAssessmentMapper.selectSupplierAssessmentList(supplierAssessment);
+    }
+
+    /**
+     * 新增供应商评估
+     * 
+     * @param supplierAssessment 供应商评估
+     * @return 结果
+     */
+    @Override
+    public int insertSupplierAssessment(SupplierAssessment supplierAssessment)
+    {
+        supplierAssessment.setCreateTime(DateUtils.getNowDate());
+        return supplierAssessmentMapper.insertSupplierAssessment(supplierAssessment);
+    }
+
+    /**
+     * 修改供应商评估
+     * 
+     * @param supplierAssessment 供应商评估
+     * @return 结果
+     */
+    @Override
+    public int updateSupplierAssessment(SupplierAssessment supplierAssessment)
+    {
+        supplierAssessment.setUpdateTime(DateUtils.getNowDate());
+        return supplierAssessmentMapper.updateSupplierAssessment(supplierAssessment);
+    }
+
+    /**
+     * 批量删除供应商评估
+     * 
+     * @param assessmentIds 需要删除的供应商评估主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSupplierAssessmentByAssessmentIds(Long[] assessmentIds)
+    {
+        return supplierAssessmentMapper.deleteSupplierAssessmentByAssessmentIds(assessmentIds);
+    }
+
+    /**
+     * 删除供应商评估信息
+     * 
+     * @param assessmentId 供应商评估主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSupplierAssessmentByAssessmentId(Long assessmentId)
+    {
+        return supplierAssessmentMapper.deleteSupplierAssessmentByAssessmentId(assessmentId);
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/gys/service/impl/SupplierCategoryServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ktg.mes.gys.service.impl;
+
+import java.util.List;
+import com.ktg.common.utils.DateUtils;
+import com.ktg.mes.gys.domain.SupplierCategory;
+import com.ktg.mes.gys.mapper.SupplierCategoryMapper;
+import com.ktg.mes.gys.service.ISupplierCategoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 供应商类别Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@Service
+public class SupplierCategoryServiceImpl implements ISupplierCategoryService
+{
+    @Autowired
+    private SupplierCategoryMapper supplierCategoryMapper;
+
+    /**
+     * 查询供应商类别
+     * 
+     * @param categoryId 供应商类别主键
+     * @return 供应商类别
+     */
+    @Override
+    public SupplierCategory selectSupplierCategoryByCategoryId(Long categoryId)
+    {
+        return supplierCategoryMapper.selectSupplierCategoryByCategoryId(categoryId);
+    }
+
+    /**
+     * 查询供应商类别列表
+     * 
+     * @param supplierCategory 供应商类别
+     * @return 供应商类别
+     */
+    @Override
+    public List<SupplierCategory> selectSupplierCategoryList(SupplierCategory supplierCategory)
+    {
+        return supplierCategoryMapper.selectSupplierCategoryList(supplierCategory);
+    }
+
+    /**
+     * 新增供应商类别
+     * 
+     * @param supplierCategory 供应商类别
+     * @return 结果
+     */
+    @Override
+    public int insertSupplierCategory(SupplierCategory supplierCategory)
+    {
+        supplierCategory.setCreateTime(DateUtils.getNowDate());
+        return supplierCategoryMapper.insertSupplierCategory(supplierCategory);
+    }
+
+    /**
+     * 修改供应商类别
+     * 
+     * @param supplierCategory 供应商类别
+     * @return 结果
+     */
+    @Override
+    public int updateSupplierCategory(SupplierCategory supplierCategory)
+    {
+        supplierCategory.setUpdateTime(DateUtils.getNowDate());
+        return supplierCategoryMapper.updateSupplierCategory(supplierCategory);
+    }
+
+    /**
+     * 批量删除供应商类别
+     * 
+     * @param categoryIds 需要删除的供应商类别主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSupplierCategoryByCategoryIds(Long[] categoryIds)
+    {
+        return supplierCategoryMapper.deleteSupplierCategoryByCategoryIds(categoryIds);
+    }
+
+    /**
+     * 删除供应商类别信息
+     * 
+     * @param categoryId 供应商类别主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSupplierCategoryByCategoryId(Long categoryId)
+    {
+        return supplierCategoryMapper.deleteSupplierCategoryByCategoryId(categoryId);
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/gys/service/impl/SupplierCooperationRecordServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ktg.mes.gys.service.impl;
+
+import java.util.List;
+import com.ktg.common.utils.DateUtils;
+import com.ktg.mes.gys.domain.SupplierCooperationRecord;
+import com.ktg.mes.gys.mapper.SupplierCooperationRecordMapper;
+import com.ktg.mes.gys.service.ISupplierCooperationRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 供应商合作记录Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@Service
+public class SupplierCooperationRecordServiceImpl implements ISupplierCooperationRecordService
+{
+    @Autowired
+    private SupplierCooperationRecordMapper supplierCooperationRecordMapper;
+
+    /**
+     * 查询供应商合作记录
+     * 
+     * @param recordId 供应商合作记录主键
+     * @return 供应商合作记录
+     */
+    @Override
+    public SupplierCooperationRecord selectSupplierCooperationRecordByRecordId(Long recordId)
+    {
+        return supplierCooperationRecordMapper.selectSupplierCooperationRecordByRecordId(recordId);
+    }
+
+    /**
+     * 查询供应商合作记录列表
+     * 
+     * @param supplierCooperationRecord 供应商合作记录
+     * @return 供应商合作记录
+     */
+    @Override
+    public List<SupplierCooperationRecord> selectSupplierCooperationRecordList(SupplierCooperationRecord supplierCooperationRecord)
+    {
+        return supplierCooperationRecordMapper.selectSupplierCooperationRecordList(supplierCooperationRecord);
+    }
+
+    /**
+     * 新增供应商合作记录
+     * 
+     * @param supplierCooperationRecord 供应商合作记录
+     * @return 结果
+     */
+    @Override
+    public int insertSupplierCooperationRecord(SupplierCooperationRecord supplierCooperationRecord)
+    {
+        supplierCooperationRecord.setCreateTime(DateUtils.getNowDate());
+        return supplierCooperationRecordMapper.insertSupplierCooperationRecord(supplierCooperationRecord);
+    }
+
+    /**
+     * 修改供应商合作记录
+     * 
+     * @param supplierCooperationRecord 供应商合作记录
+     * @return 结果
+     */
+    @Override
+    public int updateSupplierCooperationRecord(SupplierCooperationRecord supplierCooperationRecord)
+    {
+        supplierCooperationRecord.setUpdateTime(DateUtils.getNowDate());
+        return supplierCooperationRecordMapper.updateSupplierCooperationRecord(supplierCooperationRecord);
+    }
+
+    /**
+     * 批量删除供应商合作记录
+     * 
+     * @param recordIds 需要删除的供应商合作记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSupplierCooperationRecordByRecordIds(Long[] recordIds)
+    {
+        return supplierCooperationRecordMapper.deleteSupplierCooperationRecordByRecordIds(recordIds);
+    }
+
+    /**
+     * 删除供应商合作记录信息
+     * 
+     * @param recordId 供应商合作记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSupplierCooperationRecordByRecordId(Long recordId)
+    {
+        return supplierCooperationRecordMapper.deleteSupplierCooperationRecordByRecordId(recordId);
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/gys/service/impl/SupplierQualificationServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ktg.mes.gys.service.impl;
+
+import java.util.List;
+import com.ktg.common.utils.DateUtils;
+import com.ktg.mes.gys.domain.SupplierQualification;
+import com.ktg.mes.gys.mapper.SupplierQualificationMapper;
+import com.ktg.mes.gys.service.ISupplierQualificationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 供应商资质Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2025-02-21
+ */
+@Service
+public class SupplierQualificationServiceImpl implements ISupplierQualificationService
+{
+    @Autowired
+    private SupplierQualificationMapper supplierQualificationMapper;
+
+    /**
+     * 查询供应商资质
+     * 
+     * @param qualId 供应商资质主键
+     * @return 供应商资质
+     */
+    @Override
+    public SupplierQualification selectSupplierQualificationByQualId(Long qualId)
+    {
+        return supplierQualificationMapper.selectSupplierQualificationByQualId(qualId);
+    }
+
+    /**
+     * 查询供应商资质列表
+     * 
+     * @param supplierQualification 供应商资质
+     * @return 供应商资质
+     */
+    @Override
+    public List<SupplierQualification> selectSupplierQualificationList(SupplierQualification supplierQualification)
+    {
+        return supplierQualificationMapper.selectSupplierQualificationList(supplierQualification);
+    }
+
+    /**
+     * 新增供应商资质
+     * 
+     * @param supplierQualification 供应商资质
+     * @return 结果
+     */
+    @Override
+    public int insertSupplierQualification(SupplierQualification supplierQualification)
+    {
+        supplierQualification.setCreateTime(DateUtils.getNowDate());
+        return supplierQualificationMapper.insertSupplierQualification(supplierQualification);
+    }
+
+    /**
+     * 修改供应商资质
+     * 
+     * @param supplierQualification 供应商资质
+     * @return 结果
+     */
+    @Override
+    public int updateSupplierQualification(SupplierQualification supplierQualification)
+    {
+        supplierQualification.setUpdateTime(DateUtils.getNowDate());
+        return supplierQualificationMapper.updateSupplierQualification(supplierQualification);
+    }
+
+    /**
+     * 批量删除供应商资质
+     * 
+     * @param qualIds 需要删除的供应商资质主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSupplierQualificationByQualIds(Long[] qualIds)
+    {
+        return supplierQualificationMapper.deleteSupplierQualificationByQualIds(qualIds);
+    }
+
+    /**
+     * 删除供应商资质信息
+     * 
+     * @param qualId 供应商资质主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSupplierQualificationByQualId(Long qualId)
+    {
+        return supplierQualificationMapper.deleteSupplierQualificationByQualId(qualId);
+    }
+}

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/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);
 }

ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.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.WmWarehouse;
 
 /**
@@ -68,11 +70,11 @@ public interface IWmWarehouseService
 
     /**
      * 批量删除仓库设置
-     * 
+     *
      * @param warehouseIds 需要删除的仓库设置主键集合
      * @return 结果
      */
-    public int deleteWmWarehouseByWarehouseIds(Long[] warehouseIds);
+    public AjaxResult deleteWmWarehouseByWarehouseIds(Long[] warehouseIds);
 
     /**
      * 删除仓库设置信息

ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmMaterialStockServiceImpl.java

@@ -100,4 +100,34 @@ public class WmMaterialStockServiceImpl implements IWmMaterialStockService
     {
         return wmMaterialStockMapper.deleteWmMaterialStockByMaterialStockId(materialStockId);
     }
+
+    /**
+     * 根据库位id查询相关库存现有量数据
+     * @param areaId
+     * @return
+     */
+    @Override
+    public List<WmMaterialStock> getByAreaId(Long areaId) {
+        return wmMaterialStockMapper.getByAreaId(areaId);
+    }
+
+    /**
+     * 根据库区id查询相关库存现有量
+     * @param locationId
+     * @return
+     */
+    @Override
+    public List<WmMaterialStock> getLocationId(Long locationId) {
+        return wmMaterialStockMapper.getLocationId(locationId);
+    }
+
+    /**
+     * 根据仓库id查询相关库存现有量
+     * @param warehouseId
+     * @return
+     */
+    @Override
+    public List<WmMaterialStock> getByWarehouseId(Long warehouseId) {
+        return wmMaterialStockMapper.getByWarehouseId(warehouseId);
+    }
 }

ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java

@@ -1,7 +1,14 @@
 package com.ktg.mes.wm.service.impl;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.common.utils.DateUtils;
+import com.ktg.mes.wm.domain.WmMaterialStock;
+import com.ktg.mes.wm.service.IWmMaterialStockService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ktg.mes.wm.mapper.WmStorageAreaMapper;
@@ -20,6 +27,9 @@ public class WmStorageAreaServiceImpl implements IWmStorageAreaService
     @Autowired
     private WmStorageAreaMapper wmStorageAreaMapper;
 
+    @Autowired
+    private IWmMaterialStockService wmMaterialStockService;
+
     /**
      * 查询库位设置
      * 
@@ -93,14 +103,39 @@ public class WmStorageAreaServiceImpl implements IWmStorageAreaService
 
     /**
      * 批量删除库位设置
-     * 
+     *
      * @param areaIds 需要删除的库位设置主键
      * @return 结果
      */
     @Override
-    public int deleteWmStorageAreaByAreaIds(Long[] areaIds)
+    public AjaxResult deleteWmStorageAreaByAreaIds(Long[] areaIds)
     {
-        return wmStorageAreaMapper.deleteWmStorageAreaByAreaIds(areaIds);
+        // 查询所有删除数据
+        List<WmStorageArea> areaList = wmStorageAreaMapper.selectByAreaIds(areaIds);
+        for (WmStorageArea item : areaList) {
+            String areaCode = item.getAreaCode();
+            if (areaCode.contains("VIRTUAL")) {
+                return AjaxResult.error("虚拟库位不能删除");
+            }
+        }
+
+        // 校验库位中是否存在物料
+        for (Long areaId : areaIds) {
+            // 根据库位查询相关数据
+            List<WmMaterialStock> list = wmMaterialStockService.getByAreaId(areaId);
+            if (list != null && list.size() > 0) {
+                Map<Long, List<WmMaterialStock>> collect = list.stream()
+                        .collect(Collectors.groupingBy(WmMaterialStock::getItemId));
+                for (Long l : collect.keySet()) {
+                    List<WmMaterialStock> wmMaterialStocks = collect.get(l);
+                    BigDecimal reduce = wmMaterialStocks.stream().map(WmMaterialStock::getQuantityOnhand).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    if (!(reduce.compareTo(BigDecimal.ZERO) == 0)) {
+                        return AjaxResult.error("库位中还有库存不能删除");
+                    }
+                }
+            }
+        }
+        return AjaxResult.success(wmStorageAreaMapper.deleteWmStorageAreaByAreaIds(areaIds));
     }
 
     /**
@@ -124,4 +159,9 @@ public class WmStorageAreaServiceImpl implements IWmStorageAreaService
     public int deleteByLocationId(Long locationId) {
         return wmStorageAreaMapper.deleteByLocationId(locationId);
     }
+
+    @Override
+    public int deleteByLocationIds(Long[] locationIds) {
+        return wmStorageAreaMapper.deleteByLocationIds(locationIds);
+    }
 }

ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java

@@ -1,17 +1,23 @@
 package com.ktg.mes.wm.service.impl;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 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.wm.domain.WmMaterialStock;
+import com.ktg.mes.wm.service.IWmMaterialStockService;
 import com.ktg.mes.wm.service.IWmStorageAreaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ktg.mes.wm.mapper.WmStorageLocationMapper;
 import com.ktg.mes.wm.domain.WmStorageLocation;
 import com.ktg.mes.wm.service.IWmStorageLocationService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 库区设置Service业务层处理
@@ -28,6 +34,9 @@ public class WmStorageLocationServiceImpl implements IWmStorageLocationService
     @Autowired
     private IWmStorageAreaService wmStorageAreaService;
 
+    @Autowired
+    private IWmMaterialStockService wmMaterialStockService;
+
     /**
      * 查询库区设置
      * 
@@ -110,6 +119,7 @@ public class WmStorageLocationServiceImpl implements IWmStorageLocationService
      * @return 结果
      */
     @Override
+    @Transactional
     public AjaxResult deleteWmStorageLocationByLocationIds(Long[] locationIds)
     {
         // 查询所有需要删除的数据
@@ -117,14 +127,27 @@ public class WmStorageLocationServiceImpl implements IWmStorageLocationService
         for (WmStorageLocation item : list) {
             String locationCode = item.getLocationCode();
             if (locationCode.contains("VIRTUAL")) {
-                return AjaxResult.error("线边库库区不能被删除");
+                return AjaxResult.error("虚拟库区不能被删除");
             }
         }
-
+        // 校验库区中是否存在物料
-        for (Long locationId: locationIds
+        for (Long locationId : locationIds) {
-        ) {
+            // 根据库区查询相关数据
-            wmStorageAreaService.deleteByLocationId(locationId);
+            List<WmMaterialStock> materialStocks = wmMaterialStockService.getLocationId(locationId);
+            if (materialStocks != null && materialStocks.size() > 0) {
+                Map<Long, List<WmMaterialStock>> collect = materialStocks.stream()
+                        .collect(Collectors.groupingBy(WmMaterialStock::getItemId));
+                for (Long l : collect.keySet()) {
+                    List<WmMaterialStock> wmMaterialStocks = collect.get(l);
+                    BigDecimal reduce = wmMaterialStocks.stream().map(WmMaterialStock::getQuantityOnhand).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    if (!(reduce.compareTo(BigDecimal.ZERO) == 0)) {
+                        return AjaxResult.error("库区中还有库存不能删除");
+                    }
+                }
+            }
         }
+        // 关联删除相关库位
+        wmStorageAreaService.deleteByLocationIds(locationIds);
         wmStorageLocationMapper.deleteWmStorageLocationByLocationIds(locationIds);
         return AjaxResult.success();
     }

ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmWarehouseServiceImpl.java

@@ -1,21 +1,28 @@
 package com.ktg.mes.wm.service.impl;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 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.wm.domain.WmMaterialStock;
 import com.ktg.mes.wm.domain.WmStorageArea;
 import com.ktg.mes.wm.domain.WmStorageLocation;
 import com.ktg.mes.wm.mapper.WmStorageAreaMapper;
 import com.ktg.mes.wm.mapper.WmStorageLocationMapper;
-import org.apache.catalina.User;
+import com.ktg.mes.wm.service.IWmMaterialStockService;
-import org.checkerframework.checker.units.qual.A;
+import com.ktg.mes.wm.service.IWmStorageAreaService;
+import com.ktg.mes.wm.service.IWmStorageLocationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ktg.mes.wm.mapper.WmWarehouseMapper;
 import com.ktg.mes.wm.domain.WmWarehouse;
 import com.ktg.mes.wm.service.IWmWarehouseService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 仓库设置Service业务层处理
@@ -35,6 +42,15 @@ public class WmWarehouseServiceImpl implements IWmWarehouseService
     @Autowired
     private WmStorageAreaMapper wmStorageAreaMapper;
 
+    @Autowired
+    private IWmMaterialStockService wmMaterialStockService;
+
+    @Autowired
+    private IWmStorageLocationService wmStorageLocationService;
+
+    @Autowired
+    private IWmStorageAreaService wmStorageAreaService;
+
     /**
      * 查询仓库设置
      * 
@@ -117,14 +133,43 @@ public class WmWarehouseServiceImpl implements IWmWarehouseService
 
     /**
      * 批量删除仓库设置
-     * 
+     *
      * @param warehouseIds 需要删除的仓库设置主键
      * @return 结果
      */
     @Override
-    public int deleteWmWarehouseByWarehouseIds(Long[] warehouseIds)
+    @Transactional
+    public AjaxResult deleteWmWarehouseByWarehouseIds(Long[] warehouseIds)
     {
-        return wmWarehouseMapper.deleteWmWarehouseByWarehouseIds(warehouseIds);
+        // 查询所有需要删除的数据
+        List<WmWarehouse> warehouseList = wmWarehouseMapper.selectByWarehouseId(warehouseIds);
+        for (WmWarehouse item : warehouseList) {
+            String warehouseCode = item.getWarehouseCode();
+            if (warehouseCode.contains("VIRTUAL")) {
+                return AjaxResult.error("虚拟仓库不能被删除");
+            }
+        }
+        // 校验仓库中是否存在物料
+        for (Long warehouseId : warehouseIds) {
+            // 根据仓库id查询相关数据
+            List<WmMaterialStock> materialStocks = wmMaterialStockService.getByWarehouseId(warehouseId);
+            if (materialStocks != null && materialStocks.size() > 0) {
+                Map<Long, List<WmMaterialStock>> collect = materialStocks.stream()
+                        .collect(Collectors.groupingBy(WmMaterialStock::getItemId));
+                for (Long l : collect.keySet()) {
+                    List<WmMaterialStock> wmMaterialStocks = collect.get(l);
+                    BigDecimal reduce = wmMaterialStocks.stream().map(WmMaterialStock::getQuantityOnhand).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    if (!(reduce.compareTo(BigDecimal.ZERO) == 0)) {
+                        return AjaxResult.error("库区中还有库存不能删除");
+                    }
+                }
+            }
+        }
+        for (Long wahouseId: warehouseIds) {
+            wmStorageAreaService.deleteByWarehouseId(wahouseId);
+            wmStorageLocationService.deleteByWarehouseId(wahouseId);
+        }
+        return AjaxResult.success(wmWarehouseMapper.deleteWmWarehouseByWarehouseIds(warehouseIds));
     }
 
     /**

ktg-mes/src/main/resources/mapper/cg/InquiryQuotationMapper.xml

@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ktg.mes.cg.mapper.InquiryQuotationMapper">
+    
+    <resultMap type="com.ktg.mes.cg.domain.InquiryQuotation" id="InquiryQuotationResult">
+        <result property="id"    column="id"    />
+        <result property="inquiryNo"    column="inquiry_no"    />
+        <result property="title"    column="title"    />
+        <result property="initiatorId"    column="initiator_id"    />
+        <result property="initiatorName"    column="initiator_name"    />
+        <result property="initiateDate"    column="initiate_date"    />
+        <result property="materialId"    column="material_id"    />
+        <result property="materialName"    column="material_name"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="unit"    column="unit"    />
+        <result property="specs"    column="specs"    />
+        <result property="vendorId"    column="vendor_id"    />
+        <result property="vendorName"    column="vendor_name"    />
+        <result property="unitPrice"    column="unit_price"    />
+        <result property="totalPrice"    column="total_price"    />
+        <result property="deliveryTime"    column="delivery_time"    />
+        <result property="paymentTerms"    column="payment_terms"    />
+        <result property="status"    column="status"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectInquiryQuotationVo">
+        select id, inquiry_no, title, initiator_id, initiator_name, initiate_date, material_id, material_name, quantity, unit, specs, vendor_id, vendor_name, unit_price, total_price, delivery_time, payment_terms, status, remarks from inquiry_quotation
+    </sql>
+
+    <select id="selectInquiryQuotationList" parameterType="com.ktg.mes.cg.domain.InquiryQuotation" resultMap="InquiryQuotationResult">
+        <include refid="selectInquiryQuotationVo"/>
+        <where>  
+            <if test="inquiryNo != null  and inquiryNo != ''"> and inquiry_no = #{inquiryNo}</if>
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="initiatorId != null "> and initiator_id = #{initiatorId}</if>
+            <if test="initiatorName != null  and initiatorName != ''"> and initiator_name like concat('%', #{initiatorName}, '%')</if>
+            <if test="initiateDate != null "> and initiate_date = #{initiateDate}</if>
+            <if test="materialId != null "> and material_id = #{materialId}</if>
+            <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="specs != null  and specs != ''"> and specs = #{specs}</if>
+            <if test="vendorId != null "> and vendor_id = #{vendorId}</if>
+            <if test="vendorName != null  and vendorName != ''"> and vendor_name like concat('%', #{vendorName}, '%')</if>
+            <if test="unitPrice != null "> and unit_price = #{unitPrice}</if>
+            <if test="totalPrice != null "> and total_price = #{totalPrice}</if>
+            <if test="deliveryTime != null "> and delivery_time = #{deliveryTime}</if>
+            <if test="paymentTerms != null  and paymentTerms != ''"> and payment_terms = #{paymentTerms}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectInquiryQuotationById" parameterType="Long" resultMap="InquiryQuotationResult">
+        <include refid="selectInquiryQuotationVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertInquiryQuotation" parameterType="com.ktg.mes.cg.domain.InquiryQuotation">
+        insert into inquiry_quotation
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="inquiryNo != null">inquiry_no,</if>
+            <if test="title != null">title,</if>
+            <if test="initiatorId != null">initiator_id,</if>
+            <if test="initiatorName != null">initiator_name,</if>
+            <if test="initiateDate != null">initiate_date,</if>
+            <if test="materialId != null">material_id,</if>
+            <if test="materialName != null">material_name,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="unit != null">unit,</if>
+            <if test="specs != null">specs,</if>
+            <if test="vendorId != null">vendor_id,</if>
+            <if test="vendorName != null">vendor_name,</if>
+            <if test="unitPrice != null">unit_price,</if>
+            <if test="totalPrice != null">total_price,</if>
+            <if test="deliveryTime != null">delivery_time,</if>
+            <if test="paymentTerms != null">payment_terms,</if>
+            <if test="status != null">status,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="inquiryNo != null">#{inquiryNo},</if>
+            <if test="title != null">#{title},</if>
+            <if test="initiatorId != null">#{initiatorId},</if>
+            <if test="initiatorName != null">#{initiatorName},</if>
+            <if test="initiateDate != null">#{initiateDate},</if>
+            <if test="materialId != null">#{materialId},</if>
+            <if test="materialName != null">#{materialName},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="specs != null">#{specs},</if>
+            <if test="vendorId != null">#{vendorId},</if>
+            <if test="vendorName != null">#{vendorName},</if>
+            <if test="unitPrice != null">#{unitPrice},</if>
+            <if test="totalPrice != null">#{totalPrice},</if>
+            <if test="deliveryTime != null">#{deliveryTime},</if>
+            <if test="paymentTerms != null">#{paymentTerms},</if>
+            <if test="status != null">#{status},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateInquiryQuotation" parameterType="com.ktg.mes.cg.domain.InquiryQuotation">
+        update inquiry_quotation
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="inquiryNo != null">inquiry_no = #{inquiryNo},</if>
+            <if test="title != null">title = #{title},</if>
+            <if test="initiatorId != null">initiator_id = #{initiatorId},</if>
+            <if test="initiatorName != null">initiator_name = #{initiatorName},</if>
+            <if test="initiateDate != null">initiate_date = #{initiateDate},</if>
+            <if test="materialId != null">material_id = #{materialId},</if>
+            <if test="materialName != null">material_name = #{materialName},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="specs != null">specs = #{specs},</if>
+            <if test="vendorId != null">vendor_id = #{vendorId},</if>
+            <if test="vendorName != null">vendor_name = #{vendorName},</if>
+            <if test="unitPrice != null">unit_price = #{unitPrice},</if>
+            <if test="totalPrice != null">total_price = #{totalPrice},</if>
+            <if test="deliveryTime != null">delivery_time = #{deliveryTime},</if>
+            <if test="paymentTerms != null">payment_terms = #{paymentTerms},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteInquiryQuotationById" parameterType="Long">
+        delete from inquiry_quotation where id = #{id}
+    </delete>
+
+    <delete id="deleteInquiryQuotationByIds" parameterType="String">
+        delete from inquiry_quotation where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ktg-mes/src/main/resources/mapper/cg/ProcurementPlanMapper.xml

@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ktg.mes.cg.mapper.ProcurementPlanMapper">
+    
+    <resultMap type="com.ktg.mes.cg.domain.ProcurementPlan" id="ProcurementPlanResult">
+        <result property="id"    column="id"    />
+        <result property="planNo"    column="plan_no"    />
+        <result property="title"    column="title"    />
+        <result property="initiatorId"    column="initiator_id"    />
+        <result property="initiatorName"    column="initiator_name"    />
+        <result property="initiateDate"    column="initiate_date"    />
+        <result property="materialId"    column="material_id"    />
+        <result property="materialName"    column="material_name"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="unit"    column="unit"    />
+        <result property="specs"    column="specs"    />
+        <result property="vendorId"    column="vendor_id"    />
+        <result property="vendorName"    column="vendor_name"    />
+        <result property="unitPrice"    column="unit_price"    />
+        <result property="totalPrice"    column="total_price"    />
+        <result property="deliveryTime"    column="delivery_time"    />
+        <result property="paymentTerms"    column="payment_terms"    />
+        <result property="budgetAmount"    column="budget_amount"    />
+        <result property="actualAmount"    column="actual_amount"    />
+        <result property="approverId"    column="approver_id"    />
+        <result property="approverName"    column="approver_name"    />
+        <result property="approvalDate"    column="approval_date"    />
+        <result property="status"    column="status"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectProcurementPlanVo">
+        select id, plan_no, title, initiator_id, initiator_name, initiate_date, material_id, material_name, quantity, unit, specs, vendor_id, vendor_name, unit_price, total_price, delivery_time, payment_terms, budget_amount, actual_amount, approver_id, approver_name, approval_date, status, remarks from procurement_plan
+    </sql>
+
+    <select id="selectProcurementPlanList" parameterType="com.ktg.mes.cg.domain.ProcurementPlan" resultMap="ProcurementPlanResult">
+        <include refid="selectProcurementPlanVo"/>
+        <where>  
+            <if test="planNo != null  and planNo != ''"> and plan_no = #{planNo}</if>
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="initiatorId != null "> and initiator_id = #{initiatorId}</if>
+            <if test="initiatorName != null  and initiatorName != ''"> and initiator_name like concat('%', #{initiatorName}, '%')</if>
+            <if test="initiateDate != null "> and initiate_date = #{initiateDate}</if>
+            <if test="materialId != null "> and material_id = #{materialId}</if>
+            <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
+            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="specs != null  and specs != ''"> and specs = #{specs}</if>
+            <if test="vendorId != null "> and vendor_id = #{vendorId}</if>
+            <if test="vendorName != null  and vendorName != ''"> and vendor_name like concat('%', #{vendorName}, '%')</if>
+            <if test="unitPrice != null "> and unit_price = #{unitPrice}</if>
+            <if test="totalPrice != null "> and total_price = #{totalPrice}</if>
+            <if test="deliveryTime != null "> and delivery_time = #{deliveryTime}</if>
+            <if test="paymentTerms != null  and paymentTerms != ''"> and payment_terms = #{paymentTerms}</if>
+            <if test="budgetAmount != null  and budgetAmount != ''"> and budget_amount = #{budgetAmount}</if>
+            <if test="actualAmount != null  and actualAmount != ''"> and actual_amount = #{actualAmount}</if>
+            <if test="approverId != null "> and approver_id = #{approverId}</if>
+            <if test="approverName != null  and approverName != ''"> and approver_name like concat('%', #{approverName}, '%')</if>
+            <if test="approvalDate != null "> and approval_date = #{approvalDate}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectProcurementPlanById" parameterType="Long" resultMap="ProcurementPlanResult">
+        <include refid="selectProcurementPlanVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertProcurementPlan" parameterType="com.ktg.mes.cg.domain.ProcurementPlan" useGeneratedKeys="true" keyProperty="id">
+        insert into procurement_plan
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="planNo != null">plan_no,</if>
+            <if test="title != null">title,</if>
+            <if test="initiatorId != null">initiator_id,</if>
+            <if test="initiatorName != null">initiator_name,</if>
+            <if test="initiateDate != null">initiate_date,</if>
+            <if test="materialId != null">material_id,</if>
+            <if test="materialName != null">material_name,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="unit != null">unit,</if>
+            <if test="specs != null">specs,</if>
+            <if test="vendorId != null">vendor_id,</if>
+            <if test="vendorName != null">vendor_name,</if>
+            <if test="unitPrice != null">unit_price,</if>
+            <if test="totalPrice != null">total_price,</if>
+            <if test="deliveryTime != null">delivery_time,</if>
+            <if test="paymentTerms != null">payment_terms,</if>
+            <if test="budgetAmount != null">budget_amount,</if>
+            <if test="actualAmount != null">actual_amount,</if>
+            <if test="approverId != null">approver_id,</if>
+            <if test="approverName != null">approver_name,</if>
+            <if test="approvalDate != null">approval_date,</if>
+            <if test="status != null">status,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="planNo != null">#{planNo},</if>
+            <if test="title != null">#{title},</if>
+            <if test="initiatorId != null">#{initiatorId},</if>
+            <if test="initiatorName != null">#{initiatorName},</if>
+            <if test="initiateDate != null">#{initiateDate},</if>
+            <if test="materialId != null">#{materialId},</if>
+            <if test="materialName != null">#{materialName},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="specs != null">#{specs},</if>
+            <if test="vendorId != null">#{vendorId},</if>
+            <if test="vendorName != null">#{vendorName},</if>
+            <if test="unitPrice != null">#{unitPrice},</if>
+            <if test="totalPrice != null">#{totalPrice},</if>
+            <if test="deliveryTime != null">#{deliveryTime},</if>
+            <if test="paymentTerms != null">#{paymentTerms},</if>
+            <if test="budgetAmount != null">#{budgetAmount},</if>
+            <if test="actualAmount != null">#{actualAmount},</if>
+            <if test="approverId != null">#{approverId},</if>
+            <if test="approverName != null">#{approverName},</if>
+            <if test="approvalDate != null">#{approvalDate},</if>
+            <if test="status != null">#{status},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateProcurementPlan" parameterType="com.ktg.mes.cg.domain.ProcurementPlan">
+        update procurement_plan
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="planNo != null">plan_no = #{planNo},</if>
+            <if test="title != null">title = #{title},</if>
+            <if test="initiatorId != null">initiator_id = #{initiatorId},</if>
+            <if test="initiatorName != null">initiator_name = #{initiatorName},</if>
+            <if test="initiateDate != null">initiate_date = #{initiateDate},</if>
+            <if test="materialId != null">material_id = #{materialId},</if>
+            <if test="materialName != null">material_name = #{materialName},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="specs != null">specs = #{specs},</if>
+            <if test="vendorId != null">vendor_id = #{vendorId},</if>
+            <if test="vendorName != null">vendor_name = #{vendorName},</if>
+            <if test="unitPrice != null">unit_price = #{unitPrice},</if>
+            <if test="totalPrice != null">total_price = #{totalPrice},</if>
+            <if test="deliveryTime != null">delivery_time = #{deliveryTime},</if>
+            <if test="paymentTerms != null">payment_terms = #{paymentTerms},</if>
+            <if test="budgetAmount != null">budget_amount = #{budgetAmount},</if>
+            <if test="actualAmount != null">actual_amount = #{actualAmount},</if>
+            <if test="approverId != null">approver_id = #{approverId},</if>
+            <if test="approverName != null">approver_name = #{approverName},</if>
+            <if test="approvalDate != null">approval_date = #{approvalDate},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteProcurementPlanById" parameterType="Long">
+        delete from procurement_plan where id = #{id}
+    </delete>
+
+    <delete id="deleteProcurementPlanByIds" parameterType="String">
+        delete from procurement_plan where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ktg-mes/src/main/resources/mapper/cg/PurchaseOrderMapper.xml

@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ktg.mes.md.mapper.PurchaseOrderMapper">
+    
+    <resultMap type="PurchaseOrder" id="PurchaseOrderResult">
+        <result property="id"    column="id"    />
+        <result property="orderNo"    column="order_no"    />
+        <result property="title"    column="title"    />
+        <result property="vendorId"    column="vendor_id"    />
+        <result property="vendorName"    column="vendor_name"    />
+        <result property="vendorContact"    column="vendor_contact"    />
+        <result property="vendorPhone"    column="vendor_phone"    />
+        <result property="materialId"    column="material_id"    />
+        <result property="materialName"    column="material_name"    />
+        <result property="specs"    column="specs"    />
+        <result property="unit"    column="unit"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="unitPrice"    column="unit_price"    />
+        <result property="orderAmount"    column="order_amount"    />
+        <result property="tax"    column="tax"    />
+        <result property="totalAmount"    column="total_amount"    />
+        <result property="paymentTerms"    column="payment_terms"    />
+        <result property="paymentStatus"    column="payment_status"    />
+        <result property="deliveryAddress"    column="delivery_address"    />
+        <result property="expectedDeliveryDate"    column="expected_delivery_date"    />
+        <result property="actualDeliveryDate"    column="actual_delivery_date"    />
+        <result property="shippingMethod"    column="shipping_method"    />
+        <result property="shippingCost"    column="shipping_cost"    />
+        <result property="status"    column="status"    />
+        <result property="initiatorId"    column="initiator_id"    />
+        <result property="initiateDate"    column="initiate_date"    />
+        <result property="approverId"    column="approver_id"    />
+        <result property="approvalDate"    column="approval_date"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="createdDate"    column="created_date"    />
+    </resultMap>
+
+    <sql id="selectPurchaseOrderVo">
+        select id, order_no, title, vendor_id, vendor_name, vendor_contact, vendor_phone, material_id, material_name, specs, unit, quantity, unit_price, order_amount, tax, total_amount, payment_terms, payment_status, delivery_address, expected_delivery_date, actual_delivery_date, shipping_method, shipping_cost, status, initiator_id, initiate_date, approver_id, approval_date, remarks, created_date from purchase_order
+    </sql>
+
+    <select id="selectPurchaseOrderList" parameterType="PurchaseOrder" resultMap="PurchaseOrderResult">
+        <include refid="selectPurchaseOrderVo"/>
+        <where>  
+            <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="vendorId != null "> and vendor_id = #{vendorId}</if>
+            <if test="vendorName != null  and vendorName != ''"> and vendor_name like concat('%', #{vendorName}, '%')</if>
+            <if test="vendorContact != null  and vendorContact != ''"> and vendor_contact = #{vendorContact}</if>
+            <if test="vendorPhone != null  and vendorPhone != ''"> and vendor_phone = #{vendorPhone}</if>
+            <if test="materialId != null "> and material_id = #{materialId}</if>
+            <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
+            <if test="specs != null  and specs != ''"> and specs = #{specs}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="unitPrice != null "> and unit_price = #{unitPrice}</if>
+            <if test="orderAmount != null "> and order_amount = #{orderAmount}</if>
+            <if test="tax != null "> and tax = #{tax}</if>
+            <if test="totalAmount != null "> and total_amount = #{totalAmount}</if>
+            <if test="paymentTerms != null  and paymentTerms != ''"> and payment_terms = #{paymentTerms}</if>
+            <if test="paymentStatus != null  and paymentStatus != ''"> and payment_status = #{paymentStatus}</if>
+            <if test="deliveryAddress != null  and deliveryAddress != ''"> and delivery_address = #{deliveryAddress}</if>
+            <if test="expectedDeliveryDate != null "> and expected_delivery_date = #{expectedDeliveryDate}</if>
+            <if test="actualDeliveryDate != null "> and actual_delivery_date = #{actualDeliveryDate}</if>
+            <if test="shippingMethod != null  and shippingMethod != ''"> and shipping_method = #{shippingMethod}</if>
+            <if test="shippingCost != null "> and shipping_cost = #{shippingCost}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="initiatorId != null "> and initiator_id = #{initiatorId}</if>
+            <if test="initiateDate != null "> and initiate_date = #{initiateDate}</if>
+            <if test="approverId != null "> and approver_id = #{approverId}</if>
+            <if test="approvalDate != null "> and approval_date = #{approvalDate}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="createdDate != null "> and created_date = #{createdDate}</if>
+        </where>
+    </select>
+    
+    <select id="selectPurchaseOrderById" parameterType="Long" resultMap="PurchaseOrderResult">
+        <include refid="selectPurchaseOrderVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertPurchaseOrder" parameterType="PurchaseOrder" useGeneratedKeys="true" keyProperty="id">
+        insert into purchase_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderNo != null">order_no,</if>
+            <if test="title != null">title,</if>
+            <if test="vendorId != null">vendor_id,</if>
+            <if test="vendorName != null">vendor_name,</if>
+            <if test="vendorContact != null">vendor_contact,</if>
+            <if test="vendorPhone != null">vendor_phone,</if>
+            <if test="materialId != null">material_id,</if>
+            <if test="materialName != null">material_name,</if>
+            <if test="specs != null">specs,</if>
+            <if test="unit != null">unit,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="unitPrice != null">unit_price,</if>
+            <if test="orderAmount != null">order_amount,</if>
+            <if test="tax != null">tax,</if>
+            <if test="totalAmount != null">total_amount,</if>
+            <if test="paymentTerms != null">payment_terms,</if>
+            <if test="paymentStatus != null">payment_status,</if>
+            <if test="deliveryAddress != null">delivery_address,</if>
+            <if test="expectedDeliveryDate != null">expected_delivery_date,</if>
+            <if test="actualDeliveryDate != null">actual_delivery_date,</if>
+            <if test="shippingMethod != null">shipping_method,</if>
+            <if test="shippingCost != null">shipping_cost,</if>
+            <if test="status != null">status,</if>
+            <if test="initiatorId != null">initiator_id,</if>
+            <if test="initiateDate != null">initiate_date,</if>
+            <if test="approverId != null">approver_id,</if>
+            <if test="approvalDate != null">approval_date,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="createdDate != null">created_date,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderNo != null">#{orderNo},</if>
+            <if test="title != null">#{title},</if>
+            <if test="vendorId != null">#{vendorId},</if>
+            <if test="vendorName != null">#{vendorName},</if>
+            <if test="vendorContact != null">#{vendorContact},</if>
+            <if test="vendorPhone != null">#{vendorPhone},</if>
+            <if test="materialId != null">#{materialId},</if>
+            <if test="materialName != null">#{materialName},</if>
+            <if test="specs != null">#{specs},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="unitPrice != null">#{unitPrice},</if>
+            <if test="orderAmount != null">#{orderAmount},</if>
+            <if test="tax != null">#{tax},</if>
+            <if test="totalAmount != null">#{totalAmount},</if>
+            <if test="paymentTerms != null">#{paymentTerms},</if>
+            <if test="paymentStatus != null">#{paymentStatus},</if>
+            <if test="deliveryAddress != null">#{deliveryAddress},</if>
+            <if test="expectedDeliveryDate != null">#{expectedDeliveryDate},</if>
+            <if test="actualDeliveryDate != null">#{actualDeliveryDate},</if>
+            <if test="shippingMethod != null">#{shippingMethod},</if>
+            <if test="shippingCost != null">#{shippingCost},</if>
+            <if test="status != null">#{status},</if>
+            <if test="initiatorId != null">#{initiatorId},</if>
+            <if test="initiateDate != null">#{initiateDate},</if>
+            <if test="approverId != null">#{approverId},</if>
+            <if test="approvalDate != null">#{approvalDate},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="createdDate != null">#{createdDate},</if>
+         </trim>
+    </insert>
+
+    <update id="updatePurchaseOrder" parameterType="PurchaseOrder">
+        update purchase_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderNo != null">order_no = #{orderNo},</if>
+            <if test="title != null">title = #{title},</if>
+            <if test="vendorId != null">vendor_id = #{vendorId},</if>
+            <if test="vendorName != null">vendor_name = #{vendorName},</if>
+            <if test="vendorContact != null">vendor_contact = #{vendorContact},</if>
+            <if test="vendorPhone != null">vendor_phone = #{vendorPhone},</if>
+            <if test="materialId != null">material_id = #{materialId},</if>
+            <if test="materialName != null">material_name = #{materialName},</if>
+            <if test="specs != null">specs = #{specs},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="unitPrice != null">unit_price = #{unitPrice},</if>
+            <if test="orderAmount != null">order_amount = #{orderAmount},</if>
+            <if test="tax != null">tax = #{tax},</if>
+            <if test="totalAmount != null">total_amount = #{totalAmount},</if>
+            <if test="paymentTerms != null">payment_terms = #{paymentTerms},</if>
+            <if test="paymentStatus != null">payment_status = #{paymentStatus},</if>
+            <if test="deliveryAddress != null">delivery_address = #{deliveryAddress},</if>
+            <if test="expectedDeliveryDate != null">expected_delivery_date = #{expectedDeliveryDate},</if>
+            <if test="actualDeliveryDate != null">actual_delivery_date = #{actualDeliveryDate},</if>
+            <if test="shippingMethod != null">shipping_method = #{shippingMethod},</if>
+            <if test="shippingCost != null">shipping_cost = #{shippingCost},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="initiatorId != null">initiator_id = #{initiatorId},</if>
+            <if test="initiateDate != null">initiate_date = #{initiateDate},</if>
+            <if test="approverId != null">approver_id = #{approverId},</if>
+            <if test="approvalDate != null">approval_date = #{approvalDate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="createdDate != null">created_date = #{createdDate},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deletePurchaseOrderById" parameterType="Long">
+        delete from purchase_order where id = #{id}
+    </delete>
+
+    <delete id="deletePurchaseOrderByIds" parameterType="String">
+        delete from purchase_order where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ktg-mes/src/main/resources/mapper/dv/DvCheckMachineryMapper.xml

@@ -55,7 +55,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             where plan_id = #{planId}
         )  limit 1
     </select>
-        
+    <select id="getPlanId" resultType="java.lang.Long">
+        select plan_id from dv_check_machinery
+        where machinery_code = #{machineryCode}
+    </select>
+
     <insert id="insertDvCheckMachinery" parameterType="DvCheckMachinery" useGeneratedKeys="true" keyProperty="recordId">
         insert into dv_check_machinery
         <trim prefix="(" suffix=")" suffixOverrides=",">

ktg-mes/src/main/resources/mapper/dv/DvCheckPlanMapper.xml

@@ -52,7 +52,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDvCheckPlanVo"/>
         where plan_code = #{planCode}
     </select>
-        
+    <select id="getByIds" resultType="com.ktg.mes.dv.domain.DvCheckPlan" resultMap="DvCheckPlanResult">
+        <include refid="selectDvCheckPlanVo"/>
+        where plan_type = #{planType}
+        and plan_id in
+            <foreach collection="planIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+    </select>
+
     <insert id="insertDvCheckPlan" parameterType="DvCheckPlan" useGeneratedKeys="true" keyProperty="planId">
         insert into dv_check_plan
         <trim prefix="(" suffix=")" suffixOverrides=",">

ktg-mes/src/main/resources/mapper/dv/DvRepairMapper.xml

@@ -66,6 +66,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDvRepairVo"/>
         where repair_code = #{repairCode} limit 1
     </select>
+    <select id="getRepairList" resultType="com.ktg.mes.dv.domain.DvRepair" resultMap="DvRepairResult">
+        <include refid="selectDvRepairVo"/>
+        where machinery_code = #{machineryCode}
+    </select>
 
     <insert id="insertDvRepair" parameterType="DvRepair" useGeneratedKeys="true" keyProperty="repairId">
         insert into dv_repair

ktg-mes/src/main/resources/mapper/gys/SupplierAssessmentMapper.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ktg.mes.gys.mapper.SupplierAssessmentMapper">
+    
+    <resultMap type="com.ktg.mes.gys.domain.SupplierAssessment" id="SupplierAssessmentResult">
+        <result property="assessmentId"    column="assessment_id"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="assessmentTime"    column="assessment_time"    />
+        <result property="score"    column="score"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDeleted"    column="is_deleted"    />
+    </resultMap>
+
+    <sql id="selectSupplierAssessmentVo">
+        select assessment_id, supplier_name, supplier_id, assessment_time, score, remarks, create_time, update_time, is_deleted from supplier_assessment
+    </sql>
+
+    <select id="selectSupplierAssessmentList" parameterType="com.ktg.mes.gys.domain.SupplierAssessment" resultMap="SupplierAssessmentResult">
+        <include refid="selectSupplierAssessmentVo"/>
+        <where>  
+            <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
+            <if test="supplierId != null "> and supplier_id = #{supplierId}</if>
+            <if test="assessmentTime != null "> and assessment_time = #{assessmentTime}</if>
+            <if test="score != null  and score != ''"> and score = #{score}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="isDeleted != null  and isDeleted != ''"> and is_deleted = #{isDeleted}</if>
+        </where>
+    </select>
+    
+    <select id="selectSupplierAssessmentByAssessmentId" parameterType="Long" resultMap="SupplierAssessmentResult">
+        <include refid="selectSupplierAssessmentVo"/>
+        where assessment_id = #{assessmentId}
+    </select>
+        
+    <insert id="insertSupplierAssessment" parameterType="com.ktg.mes.gys.domain.SupplierAssessment">
+        insert into supplier_assessment
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="assessmentId != null">assessment_id,</if>
+            <if test="supplierName != null">supplier_name,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="assessmentTime != null">assessment_time,</if>
+            <if test="score != null">score,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDeleted != null">is_deleted,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="assessmentId != null">#{assessmentId},</if>
+            <if test="supplierName != null">#{supplierName},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="assessmentTime != null">#{assessmentTime},</if>
+            <if test="score != null">#{score},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDeleted != null">#{isDeleted},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSupplierAssessment" parameterType="com.ktg.mes.gys.domain.SupplierAssessment">
+        update supplier_assessment
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="supplierName != null">supplier_name = #{supplierName},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="assessmentTime != null">assessment_time = #{assessmentTime},</if>
+            <if test="score != null">score = #{score},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDeleted != null">is_deleted = #{isDeleted},</if>
+        </trim>
+        where assessment_id = #{assessmentId}
+    </update>
+
+    <delete id="deleteSupplierAssessmentByAssessmentId" parameterType="Long">
+        delete from supplier_assessment where assessment_id = #{assessmentId}
+    </delete>
+
+    <delete id="deleteSupplierAssessmentByAssessmentIds" parameterType="String">
+        delete from supplier_assessment where assessment_id in 
+        <foreach item="assessmentId" collection="array" open="(" separator="," close=")">
+            #{assessmentId}
+        </foreach>
+    </delete>
+</mapper>

ktg-mes/src/main/resources/mapper/gys/SupplierCategoryMapper.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ktg.mes.gys.mapper.SupplierCategoryMapper">
+    
+    <resultMap type="com.ktg.mes.gys.domain.SupplierCategory" id="SupplierCategoryResult">
+        <result property="categoryId"    column="category_id"    />
+        <result property="categoryName"    column="category_name"    />
+        <result property="description"    column="description"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDeleted"    column="is_deleted"    />
+    </resultMap>
+
+    <sql id="selectSupplierCategoryVo">
+        select category_id, category_name, description, create_time, update_time, is_deleted from supplier_category
+    </sql>
+
+    <select id="selectSupplierCategoryList" parameterType="com.ktg.mes.gys.domain.SupplierCategory" resultMap="SupplierCategoryResult">
+        <include refid="selectSupplierCategoryVo"/>
+        <where>  
+            <if test="categoryName != null  and categoryName != ''"> and category_name like concat('%', #{categoryName}, '%')</if>
+            <if test="description != null  and description != ''"> and description = #{description}</if>
+            <if test="isDeleted != null  and isDeleted != ''"> and is_deleted = #{isDeleted}</if>
+        </where>
+    </select>
+    
+    <select id="selectSupplierCategoryByCategoryId" parameterType="Long" resultMap="SupplierCategoryResult">
+        <include refid="selectSupplierCategoryVo"/>
+        where category_id = #{categoryId}
+    </select>
+        
+    <insert id="insertSupplierCategory" parameterType="com.ktg.mes.gys.domain.SupplierCategory">
+        insert into supplier_category
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="categoryId != null">category_id,</if>
+            <if test="categoryName != null and categoryName != ''">category_name,</if>
+            <if test="description != null">description,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDeleted != null">is_deleted,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="categoryId != null">#{categoryId},</if>
+            <if test="categoryName != null and categoryName != ''">#{categoryName},</if>
+            <if test="description != null">#{description},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDeleted != null">#{isDeleted},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSupplierCategory" parameterType="com.ktg.mes.gys.domain.SupplierCategory">
+        update supplier_category
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="categoryName != null and categoryName != ''">category_name = #{categoryName},</if>
+            <if test="description != null">description = #{description},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDeleted != null">is_deleted = #{isDeleted},</if>
+        </trim>
+        where category_id = #{categoryId}
+    </update>
+
+    <delete id="deleteSupplierCategoryByCategoryId" parameterType="Long">
+        delete from supplier_category where category_id = #{categoryId}
+    </delete>
+
+    <delete id="deleteSupplierCategoryByCategoryIds" parameterType="String">
+        delete from supplier_category where category_id in 
+        <foreach item="categoryId" collection="array" open="(" separator="," close=")">
+            #{categoryId}
+        </foreach>
+    </delete>
+</mapper>

ktg-mes/src/main/resources/mapper/gys/SupplierCooperationRecordMapper.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ktg.mes.gys.mapper.SupplierCooperationRecordMapper">
+    
+    <resultMap type="com.ktg.mes.gys.domain.SupplierCooperationRecord" id="SupplierCooperationRecordResult">
+        <result property="recordId"    column="record_id"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="cooperationTime"    column="cooperation_time"    />
+        <result property="content"    column="content"    />
+        <result property="amount"    column="amount"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDeleted"    column="is_deleted"    />
+    </resultMap>
+
+    <sql id="selectSupplierCooperationRecordVo">
+        select record_id, supplier_name, supplier_id, cooperation_time, content, amount, remarks, create_time, update_time, is_deleted from supplier_cooperation_record
+    </sql>
+
+    <select id="selectSupplierCooperationRecordList" parameterType="com.ktg.mes.gys.domain.SupplierCooperationRecord" resultMap="SupplierCooperationRecordResult">
+        <include refid="selectSupplierCooperationRecordVo"/>
+        <where>  
+            <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
+            <if test="supplierId != null "> and supplier_id = #{supplierId}</if>
+            <if test="cooperationTime != null "> and cooperation_time = #{cooperationTime}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="amount != null "> and amount = #{amount}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="isDeleted != null  and isDeleted != ''"> and is_deleted = #{isDeleted}</if>
+        </where>
+    </select>
+    
+    <select id="selectSupplierCooperationRecordByRecordId" parameterType="Long" resultMap="SupplierCooperationRecordResult">
+        <include refid="selectSupplierCooperationRecordVo"/>
+        where record_id = #{recordId}
+    </select>
+        
+    <insert id="insertSupplierCooperationRecord" parameterType="com.ktg.mes.gys.domain.SupplierCooperationRecord" useGeneratedKeys="true" keyProperty="recordId">
+        insert into supplier_cooperation_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="supplierName != null">supplier_name,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="cooperationTime != null">cooperation_time,</if>
+            <if test="content != null">content,</if>
+            <if test="amount != null">amount,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDeleted != null">is_deleted,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="supplierName != null">#{supplierName},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="cooperationTime != null">#{cooperationTime},</if>
+            <if test="content != null">#{content},</if>
+            <if test="amount != null">#{amount},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDeleted != null">#{isDeleted},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSupplierCooperationRecord" parameterType="com.ktg.mes.gys.domain.SupplierCooperationRecord">
+        update supplier_cooperation_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="supplierName != null">supplier_name = #{supplierName},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="cooperationTime != null">cooperation_time = #{cooperationTime},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="amount != null">amount = #{amount},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDeleted != null">is_deleted = #{isDeleted},</if>
+        </trim>
+        where record_id = #{recordId}
+    </update>
+
+    <delete id="deleteSupplierCooperationRecordByRecordId" parameterType="Long">
+        delete from supplier_cooperation_record where record_id = #{recordId}
+    </delete>
+
+    <delete id="deleteSupplierCooperationRecordByRecordIds" parameterType="String">
+        delete from supplier_cooperation_record where record_id in 
+        <foreach item="recordId" collection="array" open="(" separator="," close=")">
+            #{recordId}
+        </foreach>
+    </delete>
+</mapper>

ktg-mes/src/main/resources/mapper/gys/SupplierQualificationMapper.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ktg.mes.gys.mapper.SupplierQualificationMapper">
+    
+    <resultMap type="com.ktg.mes.gys.domain.SupplierQualification" id="SupplierQualificationResult">
+        <result property="qualId"    column="qual_id"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="qualName"    column="qual_name"    />
+        <result property="qualType"    column="qual_type"    />
+        <result property="validDate"    column="valid_date"    />
+        <result property="filePath"    column="file_path"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDeleted"    column="is_deleted"    />
+    </resultMap>
+
+    <sql id="selectSupplierQualificationVo">
+        select qual_id, supplier_id, qual_name, qual_type, valid_date, file_path, create_time, update_time, is_deleted from supplier_qualification
+    </sql>
+
+    <select id="selectSupplierQualificationList" parameterType="com.ktg.mes.gys.domain.SupplierQualification" resultMap="SupplierQualificationResult">
+        <include refid="selectSupplierQualificationVo"/>
+        <where>  
+            <if test="supplierId != null "> and supplier_id = #{supplierId}</if>
+            <if test="qualName != null  and qualName != ''"> and qual_name like concat('%', #{qualName}, '%')</if>
+            <if test="qualType != null  and qualType != ''"> and qual_type = #{qualType}</if>
+            <if test="validDate != null "> and valid_date = #{validDate}</if>
+            <if test="filePath != null  and filePath != ''"> and file_path = #{filePath}</if>
+            <if test="isDeleted != null  and isDeleted != ''"> and is_deleted = #{isDeleted}</if>
+        </where>
+    </select>
+    
+    <select id="selectSupplierQualificationByQualId" parameterType="Long" resultMap="SupplierQualificationResult">
+        <include refid="selectSupplierQualificationVo"/>
+        where qual_id = #{qualId}
+    </select>
+        
+    <insert id="insertSupplierQualification" parameterType="com.ktg.mes.gys.domain.SupplierQualification" useGeneratedKeys="true" keyProperty="qualId">
+        insert into supplier_qualification
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="qualName != null">qual_name,</if>
+            <if test="qualType != null">qual_type,</if>
+            <if test="validDate != null">valid_date,</if>
+            <if test="filePath != null">file_path,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDeleted != null">is_deleted,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="qualName != null">#{qualName},</if>
+            <if test="qualType != null">#{qualType},</if>
+            <if test="validDate != null">#{validDate},</if>
+            <if test="filePath != null">#{filePath},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDeleted != null">#{isDeleted},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSupplierQualification" parameterType="com.ktg.mes.gys.domain.SupplierQualification">
+        update supplier_qualification
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="qualName != null">qual_name = #{qualName},</if>
+            <if test="qualType != null">qual_type = #{qualType},</if>
+            <if test="validDate != null">valid_date = #{validDate},</if>
+            <if test="filePath != null">file_path = #{filePath},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDeleted != null">is_deleted = #{isDeleted},</if>
+        </trim>
+        where qual_id = #{qualId}
+    </update>
+
+    <delete id="deleteSupplierQualificationByQualId" parameterType="Long">
+        delete from supplier_qualification where qual_id = #{qualId}
+    </delete>
+
+    <delete id="deleteSupplierQualificationByQualIds" parameterType="String">
+        delete from supplier_qualification where qual_id in 
+        <foreach item="qualId" collection="array" open="(" separator="," close=")">
+            #{qualId}
+        </foreach>
+    </delete>
+</mapper>

ktg-mes/src/main/resources/mapper/md/MdProductBomMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bomItemName"    column="bom_item_name"    />
         <result property="bomItemSpec"    column="bom_item_spec"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="itemOrProduct"    column="item_or_product"    />
         <result property="quantity"    column="quantity"    />
         <result property="enableFlag"    column="enable_flag"    />
@@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMdProductBomVo">
-        select bom_id, item_id, bom_item_id, bom_item_code, bom_item_name, bom_item_spec, unit_of_measure, item_or_product, quantity, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_product_bom
+        select bom_id, item_id, bom_item_id, bom_item_code, bom_item_name, bom_item_spec, unit_of_measure, unit_name, item_or_product, quantity, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_product_bom
     </sql>
 
     <select id="selectMdProductBomList" parameterType="MdProductBom" resultMap="MdProductBomResult">
@@ -39,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bomItemName != null  and bomItemName != ''"> and bom_item_name like concat('%', #{bomItemName}, '%')</if>
             <if test="bomItemSpec != null  and bomItemSpec != ''"> and bom_item_spec = #{bomItemSpec}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="itemOrProduct != null  and itemOrProduct != ''"> and item_or_product = #{itemOrProduct}</if>
             <if test="quantity != null "> and quantity = #{quantity}</if>
             <if test="enableFlag != null  and enableFlag != ''"> and enable_flag = #{enableFlag}</if>
@@ -62,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bomItemName != null and bomItemName != ''">bom_item_name,</if>
             <if test="bomItemSpec != null">bom_item_spec,</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="itemOrProduct != null and itemOrProduct != ''">item_or_product,</if>
             <if test="quantity != null">quantity,</if>
             <if test="enableFlag != null and enableFlag != ''">enable_flag,</if>
@@ -82,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bomItemName != null and bomItemName != ''">#{bomItemName},</if>
             <if test="bomItemSpec != null">#{bomItemSpec},</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="itemOrProduct != null and itemOrProduct != ''">#{itemOrProduct},</if>
             <if test="quantity != null">#{quantity},</if>
             <if test="enableFlag != null and enableFlag != ''">#{enableFlag},</if>
@@ -106,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bomItemName != null and bomItemName != ''">bom_item_name = #{bomItemName},</if>
             <if test="bomItemSpec != null">bom_item_spec = #{bomItemSpec},</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName}</if>
             <if test="itemOrProduct != null and itemOrProduct != ''">item_or_product = #{itemOrProduct},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
             <if test="enableFlag != null and enableFlag != ''">enable_flag = #{enableFlag},</if>

ktg-mes/src/main/resources/mapper/md/MdWorkshopMapper.xml

@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMdWorkshopVo">
-        select workshop_id, workshop_code, workshop_name, area, charge, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_workshop
+        select workshop_id, workshop_code, workshop_name, area, charge, charge_id, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_workshop
     </sql>
 
     <select id="selectMdWorkshopList" parameterType="MdWorkshop" resultMap="MdWorkshopResult">