From 04d2803720568c1e7227e205d0f27cf9b83a2f00 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 06 五月 2025 14:47:04 +0800
Subject: [PATCH] BOM 基础代码
---
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsBomHeaderService.java | 61 ++++++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomHeaderServiceImpl.java | 96 ++++++++++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBomHeader.java | 57 ++++++
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsBomHeaderMapper.java | 63 +++++++
aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml | 35 ++-
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java | 4
aps-modules/aps-gen/src/main/resources/mapper/generator/GenTableMapper.xml | 8
aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml | 105 +++++++++++
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsBomHeaderController.java | 106 +++++++++++
9 files changed, 513 insertions(+), 22 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsBomHeaderController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsBomHeaderController.java
new file mode 100644
index 0000000..4ada129
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsBomHeaderController.java
@@ -0,0 +1,106 @@
+package com.aps.core.controller.mainPlan;
+
+import com.aps.common.core.utils.poi.ExcelUtil;
+import com.aps.common.core.web.controller.BaseController;
+import com.aps.common.core.web.domain.AjaxResult;
+import com.aps.common.core.web.page.TableDataInfo;
+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.ApsBomHeader;
+import com.aps.core.service.IApsBomHeaderService;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * BOM Header 鏁版嵁绠＄悊Controller
+ *
+ * @author zhl
+ * @date 2025-05-06
+ */
+
+
+@RestController
+@RequestMapping("/ApsBomHeader")
+public class ApsBomHeaderController extends BaseController
+{
+ @Autowired
+ private IApsBomHeaderService apsBomHeaderService;
+
+ /**
+ * 鏌ヨBOM Header 鏁版嵁绠＄悊鍒楄〃
+ */
+
+ @RequiresPermissions("ApsBomHeader:ApsBomHeader:list")
+ @GetMapping("/list")
+ public TableDataInfo list(ApsBomHeader apsBomHeader)
+ {
+ startPage();
+ List<ApsBomHeader> list = apsBomHeaderService.selectApsBomHeaderList(apsBomHeader);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭BOM Header 鏁版嵁绠＄悊鍒楄〃
+ */
+
+ @RequiresPermissions("ApsBomHeader:ApsBomHeader:export")
+ @Log(title = "BOM Header 鏁版嵁绠＄悊", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ApsBomHeader apsBomHeader)
+ {
+ List<ApsBomHeader> list = apsBomHeaderService.selectApsBomHeaderList(apsBomHeader);
+ ExcelUtil<ApsBomHeader> util = new ExcelUtil<ApsBomHeader>(ApsBomHeader.class);
+ util.exportExcel(response, list, "BOM Header 鏁版嵁绠＄悊鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇BOM Header 鏁版嵁绠＄悊璇︾粏淇℃伅
+ */
+
+ @RequiresPermissions("ApsBomHeader:ApsBomHeader:query")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(apsBomHeaderService.selectApsBomHeaderById(id));
+ }
+
+ /**
+ * 鏂板BOM Header 鏁版嵁绠＄悊
+ */
+
+ @RequiresPermissions("ApsBomHeader:ApsBomHeader:add")
+ @Log(title = "BOM Header 鏁版嵁绠＄悊", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ApsBomHeader apsBomHeader)
+ {
+ return toAjax(apsBomHeaderService.insertApsBomHeader(apsBomHeader));
+ }
+
+ /**
+ * 淇敼BOM Header 鏁版嵁绠＄悊
+ */
+
+ @RequiresPermissions("ApsBomHeader:ApsBomHeader:edit")
+ @Log(title = "BOM Header 鏁版嵁绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ApsBomHeader apsBomHeader)
+ {
+ return toAjax(apsBomHeaderService.updateApsBomHeader(apsBomHeader));
+ }
+
+ /**
+ * 鍒犻櫎BOM Header 鏁版嵁绠＄悊
+ */
+
+ @RequiresPermissions("ApsBomHeader:ApsBomHeader:remove")
+ @Log(title = "BOM Header 鏁版嵁绠＄悊", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(apsBomHeaderService.deleteApsBomHeaderByIds(ids));
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
index 6fe7a74..c8846f0 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
@@ -26,11 +26,11 @@
/** bomID */
@Excel(name = "bomID")
- private String bomId;
+ private String bomLineId;
/** 鐖惰妭鐐笲OM ID */
@Excel(name = "鐖惰妭鐐笲OM ID")
- private String parentBomId;
+ private String bomHeaderId;
/** 鏂欏彿 */
@Excel(name = "鏂欏彿")
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBomHeader.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBomHeader.java
new file mode 100644
index 0000000..9725dac
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBomHeader.java
@@ -0,0 +1,57 @@
+package com.aps.core.domain;
+
+import com.aps.common.core.annotation.Excel;
+import com.aps.common.core.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.util.Date;
+
+/**
+ * BOM Header 鏁版嵁绠＄悊瀵硅薄 aps_bom_header
+ *
+ * @author zhl
+ * @date 2025-05-06
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ApsBomHeader extends BaseEntity
+{
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /** 涓婚敭ID */
+ private Long id;
+
+ /** bomHeaderId */
+ @Excel(name = "bomHeaderId")
+ private String bomHeaderId;
+
+ /** 鏂欏彿 */
+ @Excel(name = "鏂欏彿")
+ private String itemCode;
+
+ /** 鐗╂枡鎻忚堪 */
+ @Excel(name = "鐗╂枡鎻忚堪")
+ private String itemName;
+
+ /** 鐢熸晥鏃ユ湡 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鐢熸晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date startDate;
+
+ /** 澶辨晥鏃ユ湡 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "澶辨晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date endDate;
+
+ /** 宸ュ巶缂栫爜 */
+ @Excel(name = "宸ュ巶缂栫爜")
+ private String orgCode;
+
+ /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
+ private String delFlag;
+
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsBomHeaderMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsBomHeaderMapper.java
new file mode 100644
index 0000000..ebc5448
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsBomHeaderMapper.java
@@ -0,0 +1,63 @@
+package com.aps.core.mapper;
+
+import java.util.List;
+import com.aps.core.domain.ApsBomHeader;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * BOM Header 鏁版嵁绠＄悊Mapper鎺ュ彛
+ *
+ * @author zhl
+ * @date 2025-05-06
+ */
+@Mapper
+public interface ApsBomHeaderMapper
+{
+ /**
+ * 鏌ヨBOM Header 鏁版嵁绠＄悊
+ *
+ * @param id BOM Header 鏁版嵁绠＄悊涓婚敭
+ * @return BOM Header 鏁版嵁绠＄悊
+ */
+ public ApsBomHeader selectApsBomHeaderById(Long id);
+
+ /**
+ * 鏌ヨBOM Header 鏁版嵁绠＄悊鍒楄〃
+ *
+ * @param apsBomHeader BOM Header 鏁版嵁绠＄悊
+ * @return BOM Header 鏁版嵁绠＄悊闆嗗悎
+ */
+ public List<ApsBomHeader> selectApsBomHeaderList(ApsBomHeader apsBomHeader);
+
+ /**
+ * 鏂板BOM Header 鏁版嵁绠＄悊
+ *
+ * @param apsBomHeader BOM Header 鏁版嵁绠＄悊
+ * @return 缁撴灉
+ */
+ public int insertApsBomHeader(ApsBomHeader apsBomHeader);
+
+ /**
+ * 淇敼BOM Header 鏁版嵁绠＄悊
+ *
+ * @param apsBomHeader BOM Header 鏁版嵁绠＄悊
+ * @return 缁撴灉
+ */
+ public int updateApsBomHeader(ApsBomHeader apsBomHeader);
+
+ /**
+ * 鍒犻櫎BOM Header 鏁版嵁绠＄悊
+ *
+ * @param id BOM Header 鏁版嵁绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteApsBomHeaderById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎BOM Header 鏁版嵁绠＄悊
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteApsBomHeaderByIds(Long[] ids);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsBomHeaderService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsBomHeaderService.java
new file mode 100644
index 0000000..d3172ba
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsBomHeaderService.java
@@ -0,0 +1,61 @@
+package com.aps.core.service;
+
+import java.util.List;
+import com.aps.core.domain.ApsBomHeader;
+
+/**
+ * BOM Header 鏁版嵁绠＄悊Service鎺ュ彛
+ *
+ * @author zhl
+ * @date 2025-05-06
+ */
+public interface IApsBomHeaderService
+{
+ /**
+ * 鏌ヨBOM Header 鏁版嵁绠＄悊
+ *
+ * @param id BOM Header 鏁版嵁绠＄悊涓婚敭
+ * @return BOM Header 鏁版嵁绠＄悊
+ */
+ public ApsBomHeader selectApsBomHeaderById(Long id);
+
+ /**
+ * 鏌ヨBOM Header 鏁版嵁绠＄悊鍒楄〃
+ *
+ * @param apsBomHeader BOM Header 鏁版嵁绠＄悊
+ * @return BOM Header 鏁版嵁绠＄悊闆嗗悎
+ */
+ public List<ApsBomHeader> selectApsBomHeaderList(ApsBomHeader apsBomHeader);
+
+ /**
+ * 鏂板BOM Header 鏁版嵁绠＄悊
+ *
+ * @param apsBomHeader BOM Header 鏁版嵁绠＄悊
+ * @return 缁撴灉
+ */
+ public int insertApsBomHeader(ApsBomHeader apsBomHeader);
+
+ /**
+ * 淇敼BOM Header 鏁版嵁绠＄悊
+ *
+ * @param apsBomHeader BOM Header 鏁版嵁绠＄悊
+ * @return 缁撴灉
+ */
+ public int updateApsBomHeader(ApsBomHeader apsBomHeader);
+
+ /**
+ * 鎵归噺鍒犻櫎BOM Header 鏁版嵁绠＄悊
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑BOM Header 鏁版嵁绠＄悊涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteApsBomHeaderByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎BOM Header 鏁版嵁绠＄悊淇℃伅
+ *
+ * @param id BOM Header 鏁版嵁绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteApsBomHeaderById(Long id);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomHeaderServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomHeaderServiceImpl.java
new file mode 100644
index 0000000..7ec3fdd
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomHeaderServiceImpl.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.ApsBomHeaderMapper;
+import com.aps.core.domain.ApsBomHeader;
+import com.aps.core.service.IApsBomHeaderService;
+
+/**
+ * BOM Header 鏁版嵁绠＄悊Service涓氬姟灞傚鐞�
+ *
+ * @author zhl
+ * @date 2025-05-06
+ */
+@Service
+public class ApsBomHeaderServiceImpl implements IApsBomHeaderService
+{
+ @Autowired
+ private ApsBomHeaderMapper apsBomHeaderMapper;
+
+ /**
+ * 鏌ヨBOM Header 鏁版嵁绠＄悊
+ *
+ * @param id BOM Header 鏁版嵁绠＄悊涓婚敭
+ * @return BOM Header 鏁版嵁绠＄悊
+ */
+ @Override
+ public ApsBomHeader selectApsBomHeaderById(Long id)
+ {
+ return apsBomHeaderMapper.selectApsBomHeaderById(id);
+ }
+
+ /**
+ * 鏌ヨBOM Header 鏁版嵁绠＄悊鍒楄〃
+ *
+ * @param apsBomHeader BOM Header 鏁版嵁绠＄悊
+ * @return BOM Header 鏁版嵁绠＄悊
+ */
+ @Override
+ public List<ApsBomHeader> selectApsBomHeaderList(ApsBomHeader apsBomHeader)
+ {
+ return apsBomHeaderMapper.selectApsBomHeaderList(apsBomHeader);
+ }
+
+ /**
+ * 鏂板BOM Header 鏁版嵁绠＄悊
+ *
+ * @param apsBomHeader BOM Header 鏁版嵁绠＄悊
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertApsBomHeader(ApsBomHeader apsBomHeader)
+ {
+ apsBomHeader.setCreateTime(DateUtils.getNowDate());
+ return apsBomHeaderMapper.insertApsBomHeader(apsBomHeader);
+ }
+
+ /**
+ * 淇敼BOM Header 鏁版嵁绠＄悊
+ *
+ * @param apsBomHeader BOM Header 鏁版嵁绠＄悊
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateApsBomHeader(ApsBomHeader apsBomHeader)
+ {
+ apsBomHeader.setUpdateTime(DateUtils.getNowDate());
+ return apsBomHeaderMapper.updateApsBomHeader(apsBomHeader);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎BOM Header 鏁版嵁绠＄悊
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑BOM Header 鏁版嵁绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteApsBomHeaderByIds(Long[] ids)
+ {
+ return apsBomHeaderMapper.deleteApsBomHeaderByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎BOM Header 鏁版嵁绠＄悊淇℃伅
+ *
+ * @param id BOM Header 鏁版嵁绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteApsBomHeaderById(Long id)
+ {
+ return apsBomHeaderMapper.deleteApsBomHeaderById(id);
+ }
+}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml
new file mode 100644
index 0000000..cc473bc
--- /dev/null
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml
@@ -0,0 +1,105 @@
+<?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.ApsBomHeaderMapper">
+
+ <resultMap type="ApsBomHeader" id="ApsBomHeaderResult">
+ <result property="id" column="id" />
+ <result property="bomHeaderId" column="bom_header_id" />
+ <result property="itemCode" column="item_code" />
+ <result property="itemName" column="item_name" />
+ <result property="startDate" column="start_date" />
+ <result property="endDate" column="end_date" />
+ <result property="orgCode" column="org_code" />
+ <result property="delFlag" column="del_flag" />
+ <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="selectApsBomHeaderVo">
+ select id, bom_header_id, item_code, item_name, start_date, end_date, org_code,
+ del_flag, create_by, create_time, update_by, update_time
+ from aps_bom_header
+ </sql>
+
+ <select id="selectApsBomHeaderList" parameterType="ApsBomHeader" resultMap="ApsBomHeaderResult">
+ <include refid="selectApsBomHeaderVo"/>
+ <where>
+ <if test="bomHeaderId != null and bomHeaderId != ''"> and bom_header_id = #{bomHeaderId}</if>
+ <if test="itemCode != null and itemCode != ''"> and item_code = #{itemCode}</if>
+ <if test="itemName != null and itemName != ''"> and item_name = #{itemName}</if>
+ <if test="startDate != null "> and start_date = #{startDate}</if>
+ <if test="endDate != null "> and end_date = #{endDate}</if>
+ <if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode}</if>
+ </where>
+ </select>
+
+ <select id="selectApsBomHeaderById" parameterType="Long" resultMap="ApsBomHeaderResult">
+ <include refid="selectApsBomHeaderVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertApsBomHeader" parameterType="ApsBomHeader">
+ insert into aps_bom_header
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="bomHeaderId != null">bom_header_id,</if>
+ <if test="itemCode != null">item_code,</if>
+ <if test="itemName != null">item_name,</if>
+ <if test="startDate != null">start_date,</if>
+ <if test="endDate != null">end_date,</if>
+ <if test="orgCode != null">org_code,</if>
+ <if test="delFlag != null">del_flag,</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="bomHeaderId != null">#{bomHeaderId},</if>
+ <if test="itemCode != null">#{itemCode},</if>
+ <if test="itemName != null">#{itemName},</if>
+ <if test="startDate != null">#{startDate},</if>
+ <if test="endDate != null">#{endDate},</if>
+ <if test="orgCode != null">#{orgCode},</if>
+ <if test="delFlag != null">#{delFlag},</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="updateApsBomHeader" parameterType="ApsBomHeader">
+ update aps_bom_header
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="bomHeaderId != null">bom_header_id = #{bomHeaderId},</if>
+ <if test="itemCode != null">item_code = #{itemCode},</if>
+ <if test="itemName != null">item_name = #{itemName},</if>
+ <if test="startDate != null">start_date = #{startDate},</if>
+ <if test="endDate != null">end_date = #{endDate},</if>
+ <if test="orgCode != null">org_code = #{orgCode},</if>
+ <if test="delFlag != null">del_flag = #{delFlag},</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="deleteApsBomHeaderById" parameterType="Long">
+ delete from aps_bom_header where id = #{id}
+ </delete>
+
+ <delete id="deleteApsBomHeaderByIds" parameterType="String">
+ delete from aps_bom_header where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
index c17395f..50f1f10 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
@@ -6,8 +6,8 @@
<resultMap type="ApsBom" id="ApsBomResult">
<result property="id" column="id" />
- <result property="bomId" column="bom_id" />
- <result property="parentBomId" column="parent_bom_id" />
+ <result property="bomLineId" column="bom_line_id" />
+ <result property="bomHeaderId" column="bom_header_id" />
<result property="itemCode" column="item_code" />
<result property="itemName" column="item_name" />
<result property="startDate" column="start_date" />
@@ -28,14 +28,17 @@
</resultMap>
<sql id="selectApsBomVo">
- select id, bom_id, parent_bom_id, item_code, item_name, start_date, end_date, org_code, del_flag, create_by, create_time, update_by, update_time, drawing_no, process_no, unit, num, total_num, preparation_time, processing_time from aps_bom
+ select id, bom_line_id, bom_header_id, item_code, item_name, start_date, end_date, org_code,
+ del_flag, create_by, create_time, update_by, update_time, drawing_no, process_no, unit, num,
+ total_num, preparation_time, processing_time
+ from aps_bom_line
</sql>
<select id="selectApsBomList" parameterType="ApsBom" resultMap="ApsBomResult">
<include refid="selectApsBomVo"/>
<where>
- <if test="bomId != null and bomId != ''"> and bom_id = #{bomId}</if>
- <if test="parentBomId != null and parentBomId != ''"> and parent_bom_id = #{parentBomId}</if>
+ <if test="bomLineId != null and bomLineId != ''"> and bom_line_id = #{bomLineId}</if>
+ <if test="bomHeaderId != null and bomHeaderId != ''"> and bom_header_id = #{bomHeaderId}</if>
<if test="itemCode != null and itemCode != ''"> and item_code like '%'||#{itemCode}||'%'</if>
<if test="itemName != null and itemName != ''"> and item_name like '%'|| #{itemName}||'%'</if>
<if test="params.beginStartDate != null and params.beginStartDate != '' and params.endStartDate != null and params.endStartDate != ''"> and start_date between #{params.beginStartDate} and #{params.endStartDate}</if>
@@ -44,7 +47,7 @@
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
and del_flag='0'
</where>
- order by parent_bom_id,bom_id
+ order by bom_header_id,bom_line_id
</select>
<select id="selectApsBomById" parameterType="Long" resultMap="ApsBomResult">
@@ -53,10 +56,10 @@
</select>
<insert id="insertApsBom" parameterType="ApsBom" useGeneratedKeys="true" keyProperty="id">
- insert into aps_bom
+ insert into aps_bom_line
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="bomId != null">bom_id,</if>
- <if test="parentBomId != null">parent_bom_id,</if>
+ <if test="bomLineId != null">bom_line_id,</if>
+ <if test="bomHeaderId != null">bom_header_id,</if>
<if test="itemCode != null">item_code,</if>
<if test="itemName != null">item_name,</if>
<if test="startDate != null">start_date,</if>
@@ -76,8 +79,8 @@
<if test="processingTime != null">processing_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="bomId != null">#{bomId},</if>
- <if test="parentBomId != null">#{parentBomId},</if>
+ <if test="bomLineId != null">#{bomLineId},</if>
+ <if test="bomHeaderId != null">#{bomHeaderId},</if>
<if test="itemCode != null">#{itemCode},</if>
<if test="itemName != null">#{itemName},</if>
<if test="startDate != null">#{startDate},</if>
@@ -99,10 +102,10 @@
</insert>
<update id="updateApsBom" parameterType="ApsBom">
- update aps_bom
+ update aps_bom_line
<trim prefix="SET" suffixOverrides=",">
- <if test="bomId != null">bom_id = #{bomId},</if>
- <if test="parentBomId != null">parent_bom_id = #{parentBomId},</if>
+ <if test="bomLineId != null">bom_line_id = #{bomLineId},</if>
+ <if test="bomHeaderId != null">bom_header_id = #{bomHeaderId},</if>
<if test="itemCode != null">item_code = #{itemCode},</if>
<if test="itemName != null">item_name = #{itemName},</if>
<if test="startDate != null">start_date = #{startDate},</if>
@@ -125,11 +128,11 @@
</update>
<delete id="deleteApsBomById" parameterType="Long">
- delete from aps_bom where id = #{id}
+ delete from aps_bom_line where id = #{id}
</delete>
<delete id="deleteApsBomByIds" parameterType="String">
- delete from aps_bom where id in
+ delete from aps_bom_line where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
diff --git a/aps-modules/aps-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/aps-modules/aps-gen/src/main/resources/mapper/generator/GenTableMapper.xml
index d901fb5..167a3c9 100644
--- a/aps-modules/aps-gen/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/aps-modules/aps-gen/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -61,10 +61,10 @@
<include refid="selectGenTableVo"/>
<where>
<if test="tableName != null and tableName != ''">
- AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+ AND lower(table_name) like '%'|| #{tableName}|| '%'
</if>
<if test="tableComment != null and tableComment != ''">
- AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+ AND lower(table_comment) like '%' || #{tableComment} ||'%'
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
and to_char(create_time,'yyyy-MM-dd') >= to_char(#{params.beginTime},'yyyy-MM-dd')
@@ -81,10 +81,10 @@
WHERE table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
AND table_name NOT IN (select table_name from gen_table)
<if test="tableName != null and tableName != ''">
- AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+ AND lower(table_name) like '%'|| #{tableName}||'%'
</if>
<if test="tableComment != null and tableComment != ''">
- AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+ AND lower(table_comment) like '%'|| #{tableComment}||'%'
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
and create_time::date >= to_date(#{params.beginTime},'yyyy-MM-dd')
--
Gitblit v1.9.3