dy
2025-04-18 8cc74feaba4856f96620e92af477df8b78adaaa0
工厂管理,车间管理后台功能提交
已添加12个文件
已修改4个文件
1290 ■■■■■ 文件已修改
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsMaterialManagementController.java 105 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsMaterialStorageManagementController.java 105 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsPlantController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsShopController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java 271 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialStorageManagement.java 119 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialManagementMapper.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialStorageManagementMapper.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsMaterialManagementService.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsMaterialStorageManagementService.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialManagementServiceImpl.java 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialManagementMapper.xml 130 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlantMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsShopMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsMaterialManagementController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,105 @@
package com.aps.core.controller.basicData;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
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.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsMaterialManagement;
import com.aps.core.service.IApsMaterialManagementService;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.page.TableDataInfo;
/**
 * ç‰©æ–™ç®¡ç†Controller
 *
 * @author dingYang
 * @date 2025-04-17
 */
@RestController
@RequestMapping("/materialManagement")
public class ApsMaterialManagementController extends BaseController
{
    @Autowired
    private IApsMaterialManagementService apsMaterialManagementService;
    /**
     * æŸ¥è¯¢ç‰©æ–™ç®¡ç†åˆ—表
     */
    @RequiresPermissions("materialManagement:materialManagement:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsMaterialManagement apsMaterialManagement)
    {
//        startPage();
        List<ApsMaterialManagement> list = apsMaterialManagementService.selectApsMaterialManagementList(apsMaterialManagement);
        return getDataTable(list);
    }
    /**
     * å¯¼å‡ºç‰©æ–™ç®¡ç†åˆ—表
     */
    @RequiresPermissions("materialManagement:materialManagement:export")
    @Log(title = "物料管理", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsMaterialManagement apsMaterialManagement)
    {
        List<ApsMaterialManagement> list = apsMaterialManagementService.selectApsMaterialManagementList(apsMaterialManagement);
        ExcelUtil<ApsMaterialManagement> util = new ExcelUtil<ApsMaterialManagement>(ApsMaterialManagement.class);
        util.exportExcel(response, list, "物料管理数据");
    }
    /**
     * èŽ·å–ç‰©æ–™ç®¡ç†è¯¦ç»†ä¿¡æ¯
     */
    @RequiresPermissions("materialManagement:materialManagement:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id)
    {
        return success(apsMaterialManagementService.selectApsMaterialManagementById(id));
    }
    /**
     * æ–°å¢žç‰©æ–™ç®¡ç†
     */
    @RequiresPermissions("materialManagement:materialManagement:add")
    @Log(title = "物料管理", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsMaterialManagement apsMaterialManagement)
    {
        return toAjax(apsMaterialManagementService.insertApsMaterialManagement(apsMaterialManagement));
    }
    /**
     * ä¿®æ”¹ç‰©æ–™ç®¡ç†
     */
    @RequiresPermissions("materialManagement:materialManagement:edit")
    @Log(title = "物料管理", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsMaterialManagement apsMaterialManagement)
    {
        return toAjax(apsMaterialManagementService.updateApsMaterialManagement(apsMaterialManagement));
    }
    /**
     * åˆ é™¤ç‰©æ–™ç®¡ç†
     */
    @RequiresPermissions("materialManagement:materialManagement:remove")
    @Log(title = "物料管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids)
    {
        return toAjax(apsMaterialManagementService.deleteApsMaterialManagementByIds(ids));
    }
}
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsMaterialStorageManagementController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,105 @@
package com.aps.core.controller.basicData;
import java.util.List;
import com.aps.core.service.IApsMaterialStorageManagementService;
import jakarta.servlet.http.HttpServletResponse;
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.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsMaterialStorageManagement;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.page.TableDataInfo;
/**
 * ç‰©æ–™åº“存管理Controller
 *
 * @author dingYang
 * @date 2025-04-17
 */
@RestController
@RequestMapping("/materialStorageManagement")
public class ApsMaterialStorageManagementController extends BaseController
{
    @Autowired
    private IApsMaterialStorageManagementService apsMaterialStorageManagementService;
    /**
     * æŸ¥è¯¢ç‰©æ–™åº“存管理列表
     */
    @RequiresPermissions("materialStorageManagement:materialStorageManagement:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsMaterialStorageManagement apsMaterialStorageManagement)
    {
        startPage();
        List<ApsMaterialStorageManagement> list = apsMaterialStorageManagementService.selectApsMaterialStorageManagementList(apsMaterialStorageManagement);
        return getDataTable(list);
    }
    /**
     * å¯¼å‡ºç‰©æ–™åº“存管理列表
     */
    @RequiresPermissions("materialStorageManagement:materialStorageManagement:export")
    @Log(title = "物料库存管理", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsMaterialStorageManagement apsMaterialStorageManagement)
    {
        List<ApsMaterialStorageManagement> list = apsMaterialStorageManagementService.selectApsMaterialStorageManagementList(apsMaterialStorageManagement);
        ExcelUtil<ApsMaterialStorageManagement> util = new ExcelUtil<ApsMaterialStorageManagement>(ApsMaterialStorageManagement.class);
        util.exportExcel(response, list, "物料库存管理数据");
    }
    /**
     * èŽ·å–ç‰©æ–™åº“å­˜ç®¡ç†è¯¦ç»†ä¿¡æ¯
     */
    @RequiresPermissions("materialStorageManagement:materialStorageManagement:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id)
    {
        return success(apsMaterialStorageManagementService.selectApsMaterialStorageManagementById(id));
    }
    /**
     * æ–°å¢žç‰©æ–™åº“存管理
     */
    @RequiresPermissions("materialStorageManagement:materialStorageManagement:add")
    @Log(title = "物料库存管理", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsMaterialStorageManagement apsMaterialStorageManagement)
    {
        return toAjax(apsMaterialStorageManagementService.insertApsMaterialStorageManagement(apsMaterialStorageManagement));
    }
    /**
     * ä¿®æ”¹ç‰©æ–™åº“存管理
     */
    @RequiresPermissions("materialStorageManagement:materialStorageManagement:edit")
    @Log(title = "物料库存管理", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsMaterialStorageManagement apsMaterialStorageManagement)
    {
        return toAjax(apsMaterialStorageManagementService.updateApsMaterialStorageManagement(apsMaterialStorageManagement));
    }
    /**
     * åˆ é™¤ç‰©æ–™åº“存管理
     */
    @RequiresPermissions("materialStorageManagement:materialStorageManagement:remove")
    @Log(title = "物料库存管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids)
    {
        return toAjax(apsMaterialStorageManagementService.deleteApsMaterialStorageManagementByIds(ids));
    }
}
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsPlantController.java
@@ -95,4 +95,15 @@
    {
        return toAjax(apsPlantService.deleteApsPlantByIds(ids));
    }
    /**
     * æŸ¥è¯¢å·¥åŽ‚ç®¡ç†åˆ—è¡¨
     */
//    @RequiresPermissions("plant:list")
    @GetMapping("/listAll")
    public AjaxResult listAll(ApsPlant apsPlant)
    {
        List<ApsPlant> list = apsPlantService.selectApsPlantList(apsPlant);
        return AjaxResult.success(list);
    }
}
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsShopController.java
@@ -95,4 +95,15 @@
    {
        return toAjax(apsShopService.deleteApsShopByIds(ids));
    }
    /**
     * æŸ¥è¯¢è½¦é—´åˆ—表
     */
//    @RequiresPermissions("shop:list")
    @GetMapping("/listAll")
    public AjaxResult listAll(ApsShop apsShop)
    {
        List<ApsShop> list = apsShopService.selectApsShopList(apsShop);
        return AjaxResult.success(list);
    }
}
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,271 @@
package com.aps.core.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.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
/**
 * ç‰©æ–™ç®¡ç†å¯¹è±¡ aps_material_management
 *
 * @author dingYang
 * @date 2025-04-17
 */
public class ApsMaterialManagement extends BaseEntity
{
    private static final long serialVersionUID = 1L;
    /** id */
    private String id;
    /** æ–™å· */
    @Excel(name = "料号")
    private String itemNumber;
    /** ç‰©æ–™æè¿° */
    @Excel(name = "物料描述")
    private String materialDescription;
    /** ç‰©æ–™çŠ¶æ€ */
    @Excel(name = "物料状态")
    private String materialStatus;
    /** ç‰©æ–™ç±»åž‹ */
    @Excel(name = "物料类型")
    private String materialType;
    /** ä¸“业归属 */
    @Excel(name = "专业归属")
    private String professionalAffiliation;
    /** å›¾å· */
    @Excel(name = "图号")
    private String drawingNo;
    /** ç‰ˆæœ¬ */
    @Excel(name = "版本")
    private String versionNumber;
    /** æœ€æ—©å¯æå‰ç”Ÿäº§å¤©æ•° */
    @Excel(name = "最早可提前生产天数")
    private String advanceProductionDays;
    /** æ‹†åˆ†æ‰¹é‡ */
    @Excel(name = "拆分批量")
    private Long splitBatch;
    /** æ˜¯å¦è‡ªåˆ¶ */
    @Excel(name = "是否自制")
    private String selfMade;
    /** é€‚用工厂 */
    @Excel(name = "适用工厂")
    private String applicableFactories;
    /** é€‚用车间 */
    @Excel(name = "适用车间")
    private String applicableWorkshop;
    /** ç”Ÿæ•ˆæ—¥æœŸ */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "生效日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date effectiveDate;
    /** å¤±æ•ˆæ—¥æœŸ */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "失效日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date expiringDate;
    /** é›†æˆæ—¥æœŸ */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "集成日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date integrationDate;
    public void setId(String id)
    {
        this.id = id;
    }
    public String getId()
    {
        return id;
    }
    public void setItemNumber(String itemNumber)
    {
        this.itemNumber = itemNumber;
    }
    public String getItemNumber()
    {
        return itemNumber;
    }
    public void setMaterialDescription(String materialDescription)
    {
        this.materialDescription = materialDescription;
    }
    public String getMaterialDescription()
    {
        return materialDescription;
    }
    public void setMaterialStatus(String materialStatus)
    {
        this.materialStatus = materialStatus;
    }
    public String getMaterialStatus()
    {
        return materialStatus;
    }
    public void setMaterialType(String materialType)
    {
        this.materialType = materialType;
    }
    public String getMaterialType()
    {
        return materialType;
    }
    public void setProfessionalAffiliation(String professionalAffiliation)
    {
        this.professionalAffiliation = professionalAffiliation;
    }
    public String getProfessionalAffiliation()
    {
        return professionalAffiliation;
    }
    public void setDrawingNo(String drawingNo)
    {
        this.drawingNo = drawingNo;
    }
    public String getDrawingNo()
    {
        return drawingNo;
    }
    public void setVersionNumber(String versionNumber)
    {
        this.versionNumber = versionNumber;
    }
    public String getVersionNumber()
    {
        return versionNumber;
    }
    public void setAdvanceProductionDays(String advanceProductionDays)
    {
        this.advanceProductionDays = advanceProductionDays;
    }
    public String getAdvanceProductionDays()
    {
        return advanceProductionDays;
    }
    public void setSplitBatch(Long splitBatch)
    {
        this.splitBatch = splitBatch;
    }
    public Long getSplitBatch()
    {
        return splitBatch;
    }
    public void setSelfMade(String selfMade)
    {
        this.selfMade = selfMade;
    }
    public String getSelfMade()
    {
        return selfMade;
    }
    public void setApplicableFactories(String applicableFactories)
    {
        this.applicableFactories = applicableFactories;
    }
    public String getApplicableFactories()
    {
        return applicableFactories;
    }
    public void setApplicableWorkshop(String applicableWorkshop)
    {
        this.applicableWorkshop = applicableWorkshop;
    }
    public String getApplicableWorkshop()
    {
        return applicableWorkshop;
    }
    public void setEffectiveDate(Date effectiveDate)
    {
        this.effectiveDate = effectiveDate;
    }
    public Date getEffectiveDate()
    {
        return effectiveDate;
    }
    public void setExpiringDate(Date expiringDate)
    {
        this.expiringDate = expiringDate;
    }
    public Date getExpiringDate()
    {
        return expiringDate;
    }
    public void setIntegrationDate(Date integrationDate)
    {
        this.integrationDate = integrationDate;
    }
    public Date getIntegrationDate()
    {
        return integrationDate;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("itemNumber", getItemNumber())
            .append("materialDescription", getMaterialDescription())
            .append("materialStatus", getMaterialStatus())
            .append("materialType", getMaterialType())
            .append("professionalAffiliation", getProfessionalAffiliation())
            .append("drawingNo", getDrawingNo())
            .append("versionNumber", getVersionNumber())
            .append("advanceProductionDays", getAdvanceProductionDays())
            .append("splitBatch", getSplitBatch())
            .append("selfMade", getSelfMade())
            .append("applicableFactories", getApplicableFactories())
            .append("applicableWorkshop", getApplicableWorkshop())
            .append("effectiveDate", getEffectiveDate())
            .append("expiringDate", getExpiringDate())
            .append("integrationDate", getIntegrationDate())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .toString();
    }
}
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialStorageManagement.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,119 @@
package com.aps.core.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.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
/**
 * ç‰©æ–™åº“存管理对象 aps_material_storage_management
 *
 * @author dingYang
 * @date 2025-04-17
 */
public class ApsMaterialStorageManagement extends BaseEntity
{
    private static final long serialVersionUID = 1L;
    /** id */
    private String id;
    /** æ–™å· */
    @Excel(name = "料号")
    private String itemNumber;
    /** æ•°é‡ */
    @Excel(name = "数量")
    private Long num;
    /** é€‚用工厂 */
    @Excel(name = "适用工厂")
    private String applicableFactories;
    /** é›†æˆæ—¥æœŸ */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "集成日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date integrationDate;
    /** åˆ·æ–°æ—¥æœŸ */
    @Excel(name = "刷新日期")
    private String refreshDate;
    public void setId(String id)
    {
        this.id = id;
    }
    public String getId()
    {
        return id;
    }
    public void setItemNumber(String itemNumber)
    {
        this.itemNumber = itemNumber;
    }
    public String getItemNumber()
    {
        return itemNumber;
    }
    public void setNum(Long num)
    {
        this.num = num;
    }
    public Long getNum()
    {
        return num;
    }
    public void setApplicableFactories(String applicableFactories)
    {
        this.applicableFactories = applicableFactories;
    }
    public String getApplicableFactories()
    {
        return applicableFactories;
    }
    public void setIntegrationDate(Date integrationDate)
    {
        this.integrationDate = integrationDate;
    }
    public Date getIntegrationDate()
    {
        return integrationDate;
    }
    public void setRefreshDate(String refreshDate)
    {
        this.refreshDate = refreshDate;
    }
    public String getRefreshDate()
    {
        return refreshDate;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("itemNumber", getItemNumber())
            .append("num", getNum())
            .append("applicableFactories", getApplicableFactories())
            .append("integrationDate", getIntegrationDate())
            .append("refreshDate", getRefreshDate())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .toString();
    }
}
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialManagementMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.aps.core.mapper;
import java.util.List;
import com.aps.core.domain.ApsMaterialManagement;
import org.apache.ibatis.annotations.Mapper;
/**
 * ç‰©æ–™ç®¡ç†Mapper接口
 *
 * @author dingYang
 * @date 2025-04-17
 */
@Mapper
public interface ApsMaterialManagementMapper
{
    /**
     * æŸ¥è¯¢ç‰©æ–™ç®¡ç†
     *
     * @param id ç‰©æ–™ç®¡ç†ä¸»é”®
     * @return ç‰©æ–™ç®¡ç†
     */
    public ApsMaterialManagement selectApsMaterialManagementById(String id);
    /**
     * æŸ¥è¯¢ç‰©æ–™ç®¡ç†åˆ—表
     *
     * @param apsMaterialManagement ç‰©æ–™ç®¡ç†
     * @return ç‰©æ–™ç®¡ç†é›†åˆ
     */
    public List<ApsMaterialManagement> selectApsMaterialManagementList(ApsMaterialManagement apsMaterialManagement);
    /**
     * æ–°å¢žç‰©æ–™ç®¡ç†
     *
     * @param apsMaterialManagement ç‰©æ–™ç®¡ç†
     * @return ç»“æžœ
     */
    public int insertApsMaterialManagement(ApsMaterialManagement apsMaterialManagement);
    /**
     * ä¿®æ”¹ç‰©æ–™ç®¡ç†
     *
     * @param apsMaterialManagement ç‰©æ–™ç®¡ç†
     * @return ç»“æžœ
     */
    public int updateApsMaterialManagement(ApsMaterialManagement apsMaterialManagement);
    /**
     * åˆ é™¤ç‰©æ–™ç®¡ç†
     *
     * @param id ç‰©æ–™ç®¡ç†ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteApsMaterialManagementById(String id);
    /**
     * æ‰¹é‡åˆ é™¤ç‰©æ–™ç®¡ç†
     *
     * @param ids éœ€è¦åˆ é™¤çš„æ•°æ®ä¸»é”®é›†åˆ
     * @return ç»“æžœ
     */
    public int deleteApsMaterialManagementByIds(String[] ids);
}
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialStorageManagementMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.aps.core.mapper;
import java.util.List;
import com.aps.core.domain.ApsMaterialStorageManagement;
import org.apache.ibatis.annotations.Mapper;
/**
 * ç‰©æ–™åº“存管理Mapper接口
 *
 * @author dingYang
 * @date 2025-04-17
 */
@Mapper
public interface ApsMaterialStorageManagementMapper
{
    /**
     * æŸ¥è¯¢ç‰©æ–™åº“存管理
     *
     * @param id ç‰©æ–™åº“存管理主键
     * @return ç‰©æ–™åº“存管理
     */
    public ApsMaterialStorageManagement selectApsMaterialStorageManagementById(String id);
    /**
     * æŸ¥è¯¢ç‰©æ–™åº“存管理列表
     *
     * @param apsMaterialStorageManagement ç‰©æ–™åº“存管理
     * @return ç‰©æ–™åº“存管理集合
     */
    public List<ApsMaterialStorageManagement> selectApsMaterialStorageManagementList(ApsMaterialStorageManagement apsMaterialStorageManagement);
    /**
     * æ–°å¢žç‰©æ–™åº“存管理
     *
     * @param apsMaterialStorageManagement ç‰©æ–™åº“存管理
     * @return ç»“æžœ
     */
    public int insertApsMaterialStorageManagement(ApsMaterialStorageManagement apsMaterialStorageManagement);
    /**
     * ä¿®æ”¹ç‰©æ–™åº“存管理
     *
     * @param apsMaterialStorageManagement ç‰©æ–™åº“存管理
     * @return ç»“æžœ
     */
    public int updateApsMaterialStorageManagement(ApsMaterialStorageManagement apsMaterialStorageManagement);
    /**
     * åˆ é™¤ç‰©æ–™åº“存管理
     *
     * @param id ç‰©æ–™åº“存管理主键
     * @return ç»“æžœ
     */
    public int deleteApsMaterialStorageManagementById(String id);
    /**
     * æ‰¹é‡åˆ é™¤ç‰©æ–™åº“存管理
     *
     * @param ids éœ€è¦åˆ é™¤çš„æ•°æ®ä¸»é”®é›†åˆ
     * @return ç»“æžœ
     */
    public int deleteApsMaterialStorageManagementByIds(String[] ids);
}
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsMaterialManagementService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.aps.core.service;
import java.util.List;
import com.aps.core.domain.ApsMaterialManagement;
/**
 * ç‰©æ–™ç®¡ç†Service接口
 *
 * @author dingYang
 * @date 2025-04-17
 */
public interface IApsMaterialManagementService
{
    /**
     * æŸ¥è¯¢ç‰©æ–™ç®¡ç†
     *
     * @param id ç‰©æ–™ç®¡ç†ä¸»é”®
     * @return ç‰©æ–™ç®¡ç†
     */
    public ApsMaterialManagement selectApsMaterialManagementById(String id);
    /**
     * æŸ¥è¯¢ç‰©æ–™ç®¡ç†åˆ—表
     *
     * @param apsMaterialManagement ç‰©æ–™ç®¡ç†
     * @return ç‰©æ–™ç®¡ç†é›†åˆ
     */
    public List<ApsMaterialManagement> selectApsMaterialManagementList(ApsMaterialManagement apsMaterialManagement);
    /**
     * æ–°å¢žç‰©æ–™ç®¡ç†
     *
     * @param apsMaterialManagement ç‰©æ–™ç®¡ç†
     * @return ç»“æžœ
     */
    public int insertApsMaterialManagement(ApsMaterialManagement apsMaterialManagement);
    /**
     * ä¿®æ”¹ç‰©æ–™ç®¡ç†
     *
     * @param apsMaterialManagement ç‰©æ–™ç®¡ç†
     * @return ç»“æžœ
     */
    public int updateApsMaterialManagement(ApsMaterialManagement apsMaterialManagement);
    /**
     * æ‰¹é‡åˆ é™¤ç‰©æ–™ç®¡ç†
     *
     * @param ids éœ€è¦åˆ é™¤çš„物料管理主键集合
     * @return ç»“æžœ
     */
    public int deleteApsMaterialManagementByIds(String[] ids);
    /**
     * åˆ é™¤ç‰©æ–™ç®¡ç†ä¿¡æ¯
     *
     * @param id ç‰©æ–™ç®¡ç†ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteApsMaterialManagementById(String id);
}
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsMaterialStorageManagementService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.aps.core.service;
import java.util.List;
import com.aps.core.domain.ApsMaterialStorageManagement;
/**
 * ç‰©æ–™åº“存管理Service接口
 *
 * @author dingYang
 * @date 2025-04-17
 */
public interface IApsMaterialStorageManagementService
{
    /**
     * æŸ¥è¯¢ç‰©æ–™åº“存管理
     *
     * @param id ç‰©æ–™åº“存管理主键
     * @return ç‰©æ–™åº“存管理
     */
    public ApsMaterialStorageManagement selectApsMaterialStorageManagementById(String id);
    /**
     * æŸ¥è¯¢ç‰©æ–™åº“存管理列表
     *
     * @param apsMaterialStorageManagement ç‰©æ–™åº“存管理
     * @return ç‰©æ–™åº“存管理集合
     */
    public List<ApsMaterialStorageManagement> selectApsMaterialStorageManagementList(ApsMaterialStorageManagement apsMaterialStorageManagement);
    /**
     * æ–°å¢žç‰©æ–™åº“存管理
     *
     * @param apsMaterialStorageManagement ç‰©æ–™åº“存管理
     * @return ç»“æžœ
     */
    public int insertApsMaterialStorageManagement(ApsMaterialStorageManagement apsMaterialStorageManagement);
    /**
     * ä¿®æ”¹ç‰©æ–™åº“存管理
     *
     * @param apsMaterialStorageManagement ç‰©æ–™åº“存管理
     * @return ç»“æžœ
     */
    public int updateApsMaterialStorageManagement(ApsMaterialStorageManagement apsMaterialStorageManagement);
    /**
     * æ‰¹é‡åˆ é™¤ç‰©æ–™åº“存管理
     *
     * @param ids éœ€è¦åˆ é™¤çš„物料库存管理主键集合
     * @return ç»“æžœ
     */
    public int deleteApsMaterialStorageManagementByIds(String[] ids);
    /**
     * åˆ é™¤ç‰©æ–™åº“存管理信息
     *
     * @param id ç‰©æ–™åº“存管理主键
     * @return ç»“æžœ
     */
    public int deleteApsMaterialStorageManagementById(String id);
}
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialManagementServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,96 @@
package com.aps.core.service.impl;
import java.util.List;
import com.aps.common.core.utils.DateUtils;
import com.aps.core.mapper.ApsMaterialManagementMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.domain.ApsMaterialManagement;
import com.aps.core.service.IApsMaterialManagementService;
/**
 * ç‰©æ–™ç®¡ç†Service业务层处理
 *
 * @author dingYang
 * @date 2025-04-17
 */
@Service
public class ApsMaterialManagementServiceImpl implements IApsMaterialManagementService
{
    @Autowired
    private ApsMaterialManagementMapper apsMaterialManagementMapper;
    /**
     * æŸ¥è¯¢ç‰©æ–™ç®¡ç†
     *
     * @param id ç‰©æ–™ç®¡ç†ä¸»é”®
     * @return ç‰©æ–™ç®¡ç†
     */
    @Override
    public ApsMaterialManagement selectApsMaterialManagementById(String id)
    {
        return apsMaterialManagementMapper.selectApsMaterialManagementById(id);
    }
    /**
     * æŸ¥è¯¢ç‰©æ–™ç®¡ç†åˆ—表
     *
     * @param apsMaterialManagement ç‰©æ–™ç®¡ç†
     * @return ç‰©æ–™ç®¡ç†
     */
    @Override
    public List<ApsMaterialManagement> selectApsMaterialManagementList(ApsMaterialManagement apsMaterialManagement)
    {
        return apsMaterialManagementMapper.selectApsMaterialManagementList(apsMaterialManagement);
    }
    /**
     * æ–°å¢žç‰©æ–™ç®¡ç†
     *
     * @param apsMaterialManagement ç‰©æ–™ç®¡ç†
     * @return ç»“æžœ
     */
    @Override
    public int insertApsMaterialManagement(ApsMaterialManagement apsMaterialManagement)
    {
        apsMaterialManagement.setCreateTime(DateUtils.getNowDate());
        return apsMaterialManagementMapper.insertApsMaterialManagement(apsMaterialManagement);
    }
    /**
     * ä¿®æ”¹ç‰©æ–™ç®¡ç†
     *
     * @param apsMaterialManagement ç‰©æ–™ç®¡ç†
     * @return ç»“æžœ
     */
    @Override
    public int updateApsMaterialManagement(ApsMaterialManagement apsMaterialManagement)
    {
        apsMaterialManagement.setUpdateTime(DateUtils.getNowDate());
        return apsMaterialManagementMapper.updateApsMaterialManagement(apsMaterialManagement);
    }
    /**
     * æ‰¹é‡åˆ é™¤ç‰©æ–™ç®¡ç†
     *
     * @param ids éœ€è¦åˆ é™¤çš„物料管理主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsMaterialManagementByIds(String[] ids)
    {
        return apsMaterialManagementMapper.deleteApsMaterialManagementByIds(ids);
    }
    /**
     * åˆ é™¤ç‰©æ–™ç®¡ç†ä¿¡æ¯
     *
     * @param id ç‰©æ–™ç®¡ç†ä¸»é”®
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsMaterialManagementById(String id)
    {
        return apsMaterialManagementMapper.deleteApsMaterialManagementById(id);
    }
}
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,96 @@
package com.aps.core.service.impl;
import java.util.List;
import com.aps.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsMaterialStorageManagementMapper;
import com.aps.core.domain.ApsMaterialStorageManagement;
import com.aps.core.service.IApsMaterialStorageManagementService;
/**
 * ç‰©æ–™åº“存管理Service业务层处理
 *
 * @author dingYang
 * @date 2025-04-17
 */
@Service
public class ApsMaterialStorageManagementServiceImpl implements IApsMaterialStorageManagementService
{
    @Autowired
    private ApsMaterialStorageManagementMapper apsMaterialStorageManagementMapper;
    /**
     * æŸ¥è¯¢ç‰©æ–™åº“存管理
     *
     * @param id ç‰©æ–™åº“存管理主键
     * @return ç‰©æ–™åº“存管理
     */
    @Override
    public ApsMaterialStorageManagement selectApsMaterialStorageManagementById(String id)
    {
        return apsMaterialStorageManagementMapper.selectApsMaterialStorageManagementById(id);
    }
    /**
     * æŸ¥è¯¢ç‰©æ–™åº“存管理列表
     *
     * @param apsMaterialStorageManagement ç‰©æ–™åº“存管理
     * @return ç‰©æ–™åº“存管理
     */
    @Override
    public List<ApsMaterialStorageManagement> selectApsMaterialStorageManagementList(ApsMaterialStorageManagement apsMaterialStorageManagement)
    {
        return apsMaterialStorageManagementMapper.selectApsMaterialStorageManagementList(apsMaterialStorageManagement);
    }
    /**
     * æ–°å¢žç‰©æ–™åº“存管理
     *
     * @param apsMaterialStorageManagement ç‰©æ–™åº“存管理
     * @return ç»“æžœ
     */
    @Override
    public int insertApsMaterialStorageManagement(ApsMaterialStorageManagement apsMaterialStorageManagement)
    {
        apsMaterialStorageManagement.setCreateTime(DateUtils.getNowDate());
        return apsMaterialStorageManagementMapper.insertApsMaterialStorageManagement(apsMaterialStorageManagement);
    }
    /**
     * ä¿®æ”¹ç‰©æ–™åº“存管理
     *
     * @param apsMaterialStorageManagement ç‰©æ–™åº“存管理
     * @return ç»“æžœ
     */
    @Override
    public int updateApsMaterialStorageManagement(ApsMaterialStorageManagement apsMaterialStorageManagement)
    {
        apsMaterialStorageManagement.setUpdateTime(DateUtils.getNowDate());
        return apsMaterialStorageManagementMapper.updateApsMaterialStorageManagement(apsMaterialStorageManagement);
    }
    /**
     * æ‰¹é‡åˆ é™¤ç‰©æ–™åº“存管理
     *
     * @param ids éœ€è¦åˆ é™¤çš„物料库存管理主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsMaterialStorageManagementByIds(String[] ids)
    {
        return apsMaterialStorageManagementMapper.deleteApsMaterialStorageManagementByIds(ids);
    }
    /**
     * åˆ é™¤ç‰©æ–™åº“存管理信息
     *
     * @param id ç‰©æ–™åº“存管理主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsMaterialStorageManagementById(String id)
    {
        return apsMaterialStorageManagementMapper.deleteApsMaterialStorageManagementById(id);
    }
}
aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialManagementMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,130 @@
<?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.aps.core.mapper.ApsMaterialManagementMapper">
    <resultMap type="ApsMaterialManagement" id="ApsMaterialManagementResult">
        <result property="id"    column="id"    />
        <result property="itemNumber"    column="item_number"    />
        <result property="materialDescription"    column="material_description"    />
        <result property="materialStatus"    column="material_status"    />
        <result property="materialType"    column="material_type"    />
        <result property="professionalAffiliation"    column="professional_affiliation"    />
        <result property="drawingNo"    column="drawing_no"    />
        <result property="versionNumber"    column="version_number"    />
        <result property="advanceProductionDays"    column="advance_production_days"    />
        <result property="splitBatch"    column="split_batch"    />
        <result property="selfMade"    column="self_made"    />
        <result property="applicableFactories"    column="applicable_factories"    />
        <result property="applicableWorkshop"    column="applicable_workshop"    />
        <result property="effectiveDate"    column="effective_date"    />
        <result property="expiringDate"    column="expiring_date"    />
        <result property="integrationDate"    column="integration_date"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
    </resultMap>
    <sql id="selectApsMaterialManagementVo">
        select id, item_number, material_description, material_status, material_type, professional_affiliation, drawing_no, version_number, advance_production_days, split_batch, self_made, applicable_factories, applicable_workshop, effective_date, expiring_date, integration_date, create_by, create_time, update_by, update_time from aps_material_management
    </sql>
    <select id="selectApsMaterialManagementList" parameterType="ApsMaterialManagement" resultMap="ApsMaterialManagementResult">
        <include refid="selectApsMaterialManagementVo"/>
        <where>
            <if test="itemNumber != null "> and item_number = #{itemNumber}</if>
        </where>
    </select>
    <select id="selectApsMaterialManagementById" parameterType="String" resultMap="ApsMaterialManagementResult">
        <include refid="selectApsMaterialManagementVo"/>
        where id = #{id}
    </select>
    <insert id="insertApsMaterialManagement" parameterType="ApsMaterialManagement">
        insert into aps_material_management
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="itemNumber != null">item_number,</if>
            <if test="materialDescription != null">material_description,</if>
            <if test="materialStatus != null">material_status,</if>
            <if test="materialType != null">material_type,</if>
            <if test="professionalAffiliation != null">professional_affiliation,</if>
            <if test="drawingNo != null">drawing_no,</if>
            <if test="versionNumber != null">version_number,</if>
            <if test="advanceProductionDays != null">advance_production_days,</if>
            <if test="splitBatch != null">split_batch,</if>
            <if test="selfMade != null">self_made,</if>
            <if test="applicableFactories != null">applicable_factories,</if>
            <if test="applicableWorkshop != null">applicable_workshop,</if>
            <if test="effectiveDate != null">effective_date,</if>
            <if test="expiringDate != null">expiring_date,</if>
            <if test="integrationDate != null">integration_date,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="itemNumber != null">#{itemNumber},</if>
            <if test="materialDescription != null">#{materialDescription},</if>
            <if test="materialStatus != null">#{materialStatus},</if>
            <if test="materialType != null">#{materialType},</if>
            <if test="professionalAffiliation != null">#{professionalAffiliation},</if>
            <if test="drawingNo != null">#{drawingNo},</if>
            <if test="versionNumber != null">#{versionNumber},</if>
            <if test="advanceProductionDays != null">#{advanceProductionDays},</if>
            <if test="splitBatch != null">#{splitBatch},</if>
            <if test="selfMade != null">#{selfMade},</if>
            <if test="applicableFactories != null">#{applicableFactories},</if>
            <if test="applicableWorkshop != null">#{applicableWorkshop},</if>
            <if test="effectiveDate != null">#{effectiveDate},</if>
            <if test="expiringDate != null">#{expiringDate},</if>
            <if test="integrationDate != null">#{integrationDate},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
         </trim>
    </insert>
    <update id="updateApsMaterialManagement" parameterType="ApsMaterialManagement">
        update aps_material_management
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNumber != null">item_number = #{itemNumber},</if>
            <if test="materialDescription != null">material_description = #{materialDescription},</if>
            <if test="materialStatus != null">material_status = #{materialStatus},</if>
            <if test="materialType != null">material_type = #{materialType},</if>
            <if test="professionalAffiliation != null">professional_affiliation = #{professionalAffiliation},</if>
            <if test="drawingNo != null">drawing_no = #{drawingNo},</if>
            <if test="versionNumber != null">version_number = #{versionNumber},</if>
            <if test="advanceProductionDays != null">advance_production_days = #{advanceProductionDays},</if>
            <if test="splitBatch != null">split_batch = #{splitBatch},</if>
            <if test="selfMade != null">self_made = #{selfMade},</if>
            <if test="applicableFactories != null">applicable_factories = #{applicableFactories},</if>
            <if test="applicableWorkshop != null">applicable_workshop = #{applicableWorkshop},</if>
            <if test="effectiveDate != null">effective_date = #{effectiveDate},</if>
            <if test="expiringDate != null">expiring_date = #{expiringDate},</if>
            <if test="integrationDate != null">integration_date = #{integrationDate},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
        </trim>
        where id = #{id}
    </update>
    <delete id="deleteApsMaterialManagementById" parameterType="String">
        delete from aps_material_management where id = #{id}
    </delete>
    <delete id="deleteApsMaterialManagementByIds" parameterType="String">
        delete from aps_material_management where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>
aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,90 @@
<?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.aps.core.mapper.ApsMaterialStorageManagementMapper">
    <resultMap type="ApsMaterialStorageManagement" id="ApsMaterialStorageManagementResult">
        <result property="id"    column="id"    />
        <result property="itemNumber"    column="item_number"    />
        <result property="num"    column="num"    />
        <result property="applicableFactories"    column="applicable_factories"    />
        <result property="integrationDate"    column="integration_date"    />
        <result property="refreshDate"    column="refresh_date"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
    </resultMap>
    <sql id="selectApsMaterialStorageManagementVo">
        select id, item_number, num, applicable_factories, integration_date, refresh_date, create_by, create_time, update_by, update_time from aps_material_storage_management
    </sql>
    <select id="selectApsMaterialStorageManagementList" parameterType="ApsMaterialStorageManagement" resultMap="ApsMaterialStorageManagementResult">
        <include refid="selectApsMaterialStorageManagementVo"/>
        <where>
            <if test="itemNumber != null  and itemNumber != ''"> and item_number = #{itemNumber}</if>
        </where>
    </select>
    <select id="selectApsMaterialStorageManagementById" parameterType="String" resultMap="ApsMaterialStorageManagementResult">
        <include refid="selectApsMaterialStorageManagementVo"/>
        where id = #{id}
    </select>
    <insert id="insertApsMaterialStorageManagement" parameterType="ApsMaterialStorageManagement">
        insert into aps_material_storage_management
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="itemNumber != null">item_number,</if>
            <if test="num != null">num,</if>
            <if test="applicableFactories != null">applicable_factories,</if>
            <if test="integrationDate != null">integration_date,</if>
            <if test="refreshDate != null">refresh_date,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="itemNumber != null">#{itemNumber},</if>
            <if test="num != null">#{num},</if>
            <if test="applicableFactories != null">#{applicableFactories},</if>
            <if test="integrationDate != null">#{integrationDate},</if>
            <if test="refreshDate != null">#{refreshDate},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
         </trim>
    </insert>
    <update id="updateApsMaterialStorageManagement" parameterType="ApsMaterialStorageManagement">
        update aps_material_storage_management
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNumber != null">item_number = #{itemNumber},</if>
            <if test="num != null">num = #{num},</if>
            <if test="applicableFactories != null">applicable_factories = #{applicableFactories},</if>
            <if test="integrationDate != null">integration_date = #{integrationDate},</if>
            <if test="refreshDate != null">refresh_date = #{refreshDate},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
        </trim>
        where id = #{id}
    </update>
    <delete id="deleteApsMaterialStorageManagementById" parameterType="String">
        delete from aps_material_storage_management where id = #{id}
    </delete>
    <delete id="deleteApsMaterialStorageManagementByIds" parameterType="String">
        delete from aps_material_storage_management where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlantMapper.xml
@@ -22,8 +22,8 @@
    <select id="selectApsPlantList" parameterType="ApsPlant" resultMap="ApsPlantResult">
        <include refid="selectApsPlantVo"/>
        <where>  
            <if test="plantName != null  and plantName != ''"> and plant_name like '%' || #{plantName} || '%'</if>
            <if test="plantCode != null  and plantCode != ''"> and plant_code like '%' || #{plantCode} || '%'</if>
            <if test="plantName != null  and plantName != ''"> and plant_name = #{plantName}</if>
            <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
            <if test="status != null  and status != ''"> and status = #{status}</if>
        </where>
    </select>
aps-modules/aps-core/src/main/resources/mapper/core/ApsShopMapper.xml
@@ -23,8 +23,8 @@
    <select id="selectApsShopList" parameterType="ApsShop" resultMap="ApsShopResult">
        <include refid="selectApsShopVo"/>
        <where>  
            <if test="shopName != null  and shopName != ''"> and shop_name like concat('%', #{shopName}, '%')</if>
            <if test="shopCode != null  and shopCode != ''"> and shop_code like concat('%', #{shopCode}, '%')</if>
            <if test="shopName != null  and shopName != ''"> and shop_name = #{shopName}</if>
            <if test="shopCode != null  and shopCode != ''"> and shop_code = #{shopCode}</if>
            <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
            <if test="status != null  and status != ''"> and status = #{status}</if>
        </where>