From 11f0166e469d27720873a05d7ba76ce9aa444659 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Tue, 19 Sep 2023 14:20:38 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseMaterialinfoController.java | 103 +++++++ .../controller/BaseProductLineController.java | 114 ++++++++ .../controller/BaseProductlineController.java | 103 ------- .../aucma/base/domain/BaseMaterialinfo.java | 263 ++++++++++++++++++ ...eProductline.java => BaseProductLine.java} | 74 ++--- .../base/mapper/BaseMaterialinfoMapper.java | 61 ++++ .../base/mapper/BaseProductLineMapper.java | 61 ++++ .../base/mapper/BaseProductlineMapper.java | 61 ---- .../service/IBaseMaterialinfoService.java | 61 ++++ .../base/service/IBaseProductLineService.java | 61 ++++ .../base/service/IBaseProductlineService.java | 61 ---- .../impl/BaseMaterialinfoServiceImpl.java | 93 +++++++ .../impl/BaseProductLineServiceImpl.java | 93 +++++++ .../impl/BaseProductlineServiceImpl.java | 93 ------- .../mapper/base/BaseMaterialinfoMapper.xml | 151 ++++++++++ .../mapper/base/BaseProductLineMapper.xml | 115 ++++++++ .../mapper/base/BaseProductlineMapper.xml | 118 -------- 17 files changed, 1213 insertions(+), 473 deletions(-) create mode 100644 aucma-base/src/main/java/com/aucma/base/controller/BaseMaterialinfoController.java create mode 100644 aucma-base/src/main/java/com/aucma/base/controller/BaseProductLineController.java delete mode 100644 aucma-base/src/main/java/com/aucma/base/controller/BaseProductlineController.java create mode 100644 aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialinfo.java rename aucma-base/src/main/java/com/aucma/base/domain/{BaseProductline.java => BaseProductLine.java} (61%) create mode 100644 aucma-base/src/main/java/com/aucma/base/mapper/BaseMaterialinfoMapper.java create mode 100644 aucma-base/src/main/java/com/aucma/base/mapper/BaseProductLineMapper.java delete mode 100644 aucma-base/src/main/java/com/aucma/base/mapper/BaseProductlineMapper.java create mode 100644 aucma-base/src/main/java/com/aucma/base/service/IBaseMaterialinfoService.java create mode 100644 aucma-base/src/main/java/com/aucma/base/service/IBaseProductLineService.java delete mode 100644 aucma-base/src/main/java/com/aucma/base/service/IBaseProductlineService.java create mode 100644 aucma-base/src/main/java/com/aucma/base/service/impl/BaseMaterialinfoServiceImpl.java create mode 100644 aucma-base/src/main/java/com/aucma/base/service/impl/BaseProductLineServiceImpl.java delete mode 100644 aucma-base/src/main/java/com/aucma/base/service/impl/BaseProductlineServiceImpl.java create mode 100644 aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml create mode 100644 aucma-base/src/main/resources/mapper/base/BaseProductLineMapper.xml delete mode 100644 aucma-base/src/main/resources/mapper/base/BaseProductlineMapper.xml diff --git a/aucma-base/src/main/java/com/aucma/base/controller/BaseMaterialinfoController.java b/aucma-base/src/main/java/com/aucma/base/controller/BaseMaterialinfoController.java new file mode 100644 index 0000000..cfb9588 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/controller/BaseMaterialinfoController.java @@ -0,0 +1,103 @@ +package com.aucma.base.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.aucma.common.utils.DateUtils; +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.aucma.common.annotation.Log; +import com.aucma.common.core.controller.BaseController; +import com.aucma.common.core.domain.AjaxResult; +import com.aucma.common.enums.BusinessType; +import com.aucma.base.domain.BaseMaterialInfo; +import com.aucma.base.service.IBaseMaterialInfoService; +import com.aucma.common.utils.poi.ExcelUtil; +import com.aucma.common.core.page.TableDataInfo; + +/** + * 物料信息Controller + * + * @author Yinq + * @date 2023-09-19 + */ +@RestController +@RequestMapping("/base/materialInfo" ) +public class BaseMaterialInfoController extends BaseController { + @Autowired + private IBaseMaterialInfoService baseMaterialInfoService; + + /** + * 查询物料信息列表 + */ + @PreAuthorize("@ss.hasPermi('base:materialInfo:list')" ) + @GetMapping("/list" ) + public TableDataInfo list(BaseMaterialInfo baseMaterialInfo) { + startPage(); + List list = baseMaterialInfoService.selectBaseMaterialInfoList(baseMaterialInfo); + return getDataTable(list); + } + + /** + * 导出物料信息列表 + */ + @PreAuthorize("@ss.hasPermi('base:materialInfo:export')" ) + @Log(title = "物料信息" , businessType = BusinessType.EXPORT) + @PostMapping("/export" ) + public void export(HttpServletResponse response, BaseMaterialInfo baseMaterialInfo) { + List list = baseMaterialInfoService.selectBaseMaterialInfoList(baseMaterialInfo); + ExcelUtil util = new ExcelUtil(BaseMaterialInfo. class); + util.exportExcel(response, list, "物料信息数据" ); + } + + /** + * 获取物料信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('base:materialInfo:query')" ) + @GetMapping(value = "/{objId}" ) + public AjaxResult getInfo(@PathVariable("objId" ) Long objId) { + return success(baseMaterialInfoService.selectBaseMaterialInfoByObjId(objId)); + } + + /** + * 新增物料信息 + */ + @PreAuthorize("@ss.hasPermi('base:materialInfo:add')" ) + @Log(title = "物料信息" , businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BaseMaterialInfo baseMaterialInfo) { + baseMaterialInfo.setCreatedBy(getUsername()); + baseMaterialInfo.setCreatedTime(DateUtils.getNowDate()); + return toAjax(baseMaterialInfoService.insertBaseMaterialInfo(baseMaterialInfo)); + } + + /** + * 修改物料信息 + */ + @PreAuthorize("@ss.hasPermi('base:materialInfo:edit')" ) + @Log(title = "物料信息" , businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BaseMaterialInfo baseMaterialInfo) { + baseMaterialInfo.setUpdatedBy(getUsername()); + baseMaterialInfo.setUpdatedTime(DateUtils.getNowDate()); + return toAjax(baseMaterialInfoService.updateBaseMaterialInfo(baseMaterialInfo)); + } + + /** + * 删除物料信息 + */ + @PreAuthorize("@ss.hasPermi('base:materialInfo:remove')" ) + @Log(title = "物料信息" , businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}" ) + public AjaxResult remove(@PathVariable Long[] objIds) { + return toAjax(baseMaterialInfoService.deleteBaseMaterialInfoByObjIds(objIds)); + } +} diff --git a/aucma-base/src/main/java/com/aucma/base/controller/BaseProductLineController.java b/aucma-base/src/main/java/com/aucma/base/controller/BaseProductLineController.java new file mode 100644 index 0000000..b304900 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/controller/BaseProductLineController.java @@ -0,0 +1,114 @@ +package com.aucma.base.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.aucma.common.utils.DateUtils; +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.aucma.common.annotation.Log; +import com.aucma.common.core.controller.BaseController; +import com.aucma.common.core.domain.AjaxResult; +import com.aucma.common.enums.BusinessType; +import com.aucma.base.domain.BaseProductLine; +import com.aucma.base.service.IBaseProductLineService; +import com.aucma.common.utils.poi.ExcelUtil; +import com.aucma.common.core.page.TableDataInfo; + +/** + * 产线信息Controller + * + * @author Yinq + * @date 2023-09-19 + */ +@RestController +@RequestMapping("/base/productLine") +public class BaseProductLineController extends BaseController { + @Autowired + private IBaseProductLineService baseProductLineService; + + /** + * 查询产线信息列表 + */ + @PreAuthorize("@ss.hasPermi('base:productLine:list')") + @GetMapping("/list") + public TableDataInfo list(BaseProductLine baseProductLine) { + startPage(); + List list = baseProductLineService.selectBaseProductLineList(baseProductLine); + return getDataTable(list); + } + + /** + * 查询产线下拉框列表 + * @param baseProductLine + * @return + */ + @GetMapping("/findProductLineList") + public AjaxResult findProductLineList(BaseProductLine baseProductLine) { + List list = baseProductLineService.selectBaseProductLineList(baseProductLine); + return success(list); + } + + /** + * 导出产线信息列表 + */ + @PreAuthorize("@ss.hasPermi('base:productLine:export')") + @Log(title = "产线信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BaseProductLine baseProductLine) { + List list = baseProductLineService.selectBaseProductLineList(baseProductLine); + ExcelUtil util = new ExcelUtil(BaseProductLine.class); + util.exportExcel(response, list, "产线信息数据"); + } + + /** + * 获取产线信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('base:productLine:query')") + @GetMapping(value = "/{objId}") + public AjaxResult getInfo(@PathVariable("objId") Long objId) { + return success(baseProductLineService.selectBaseProductLineByObjId(objId)); + } + + /** + * 新增产线信息 + */ + @PreAuthorize("@ss.hasPermi('base:productLine:add')") + @Log(title = "产线信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BaseProductLine baseProductLine) { + baseProductLine.setCreatedBy(getUsername()); + baseProductLine.setCreatedTime(DateUtils.getNowDate()); + return toAjax(baseProductLineService.insertBaseProductLine(baseProductLine)); + } + + /** + * 修改产线信息 + */ + @PreAuthorize("@ss.hasPermi('base:productLine:edit')") + @Log(title = "产线信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BaseProductLine baseProductLine) { + baseProductLine.setUpdatedBy(getUsername()); + baseProductLine.setUpdatedTime(DateUtils.getNowDate()); + return toAjax(baseProductLineService.updateBaseProductLine(baseProductLine)); + } + + /** + * 删除产线信息 + */ + @PreAuthorize("@ss.hasPermi('base:productLine:remove')") + @Log(title = "产线信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}") + public AjaxResult remove(@PathVariable Long[] objIds) { + return toAjax(baseProductLineService.deleteBaseProductLineByObjIds(objIds)); + } +} diff --git a/aucma-base/src/main/java/com/aucma/base/controller/BaseProductlineController.java b/aucma-base/src/main/java/com/aucma/base/controller/BaseProductlineController.java deleted file mode 100644 index 02721c9..0000000 --- a/aucma-base/src/main/java/com/aucma/base/controller/BaseProductlineController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.aucma.base.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.aucma.common.utils.DateUtils; -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.aucma.common.annotation.Log; -import com.aucma.common.core.controller.BaseController; -import com.aucma.common.core.domain.AjaxResult; -import com.aucma.common.enums.BusinessType; -import com.aucma.base.domain.BaseProductline; -import com.aucma.base.service.IBaseProductlineService; -import com.aucma.common.utils.poi.ExcelUtil; -import com.aucma.common.core.page.TableDataInfo; - -/** - * 产线信息Controller - * - * @author Yinq - * @date 2023-09-18 - */ -@RestController -@RequestMapping("/base/productline") -public class BaseProductlineController extends BaseController { - @Autowired - private IBaseProductlineService baseProductlineService; - - /** - * 查询产线信息列表 - */ - @PreAuthorize("@ss.hasPermi('base:productline:list')") - @GetMapping("/list") - public TableDataInfo list(BaseProductline baseProductline) { - startPage(); - List list = baseProductlineService.selectBaseProductlineList(baseProductline); - return getDataTable(list); - } - - /** - * 导出产线信息列表 - */ - @PreAuthorize("@ss.hasPermi('base:productline:export')") - @Log(title = "产线信息" , businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, BaseProductline baseProductline) { - List list = baseProductlineService.selectBaseProductlineList(baseProductline); - ExcelUtil util = new ExcelUtil(BaseProductline.class); - util.exportExcel(response, list, "产线信息数据"); - } - - /** - * 获取产线信息详细信息 - */ - @PreAuthorize("@ss.hasPermi('base:productline:query')") - @GetMapping(value = "/{objid}") - public AjaxResult getInfo(@PathVariable("objid") Long objid) { - return success(baseProductlineService.selectBaseProductlineByObjid(objid)); - } - - /** - * 新增产线信息 - */ - @PreAuthorize("@ss.hasPermi('base:productline:add')") - @Log(title = "产线信息" , businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody BaseProductline baseProductline) { - baseProductline.setCreatedBy(getUsername()); - baseProductline.setCreatedTime(DateUtils.getNowDate()); - return toAjax(baseProductlineService.insertBaseProductline(baseProductline)); - } - - /** - * 修改产线信息 - */ - @PreAuthorize("@ss.hasPermi('base:productline:edit')") - @Log(title = "产线信息" , businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody BaseProductline baseProductline) { - baseProductline.setUpdatedBy(getUsername()); - baseProductline.setUpdatedTime(DateUtils.getNowDate()); - return toAjax(baseProductlineService.updateBaseProductline(baseProductline)); - } - - /** - * 删除产线信息 - */ - @PreAuthorize("@ss.hasPermi('base:productline:remove')") - @Log(title = "产线信息" , businessType = BusinessType.DELETE) - @DeleteMapping("/{objids}") - public AjaxResult remove(@PathVariable Long[] objids) { - return toAjax(baseProductlineService.deleteBaseProductlineByObjids(objids)); - } -} diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialinfo.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialinfo.java new file mode 100644 index 0000000..58e6443 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialinfo.java @@ -0,0 +1,263 @@ +package com.aucma.base.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.aucma.common.annotation.Excel; +import com.aucma.common.core.domain.BaseEntity; + +/** + * 物料信息对象 base_materialinfo + * + * @author Yinq + * @date 2023-09-19 + */ +public class BaseMaterialInfo extends BaseEntity +{ + private static final long serialVersionUID=1L; + + /** 主键标识 */ + private Long objId; + + /** 物料编码 */ + @Excel(name = "物料编码") + private String materialCode; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 物料大类 */ + @Excel(name = "物料大类") + private String materialCategories; + + /** 物料小类 */ + @Excel(name = "物料小类") + private String materialSubclass; + + /** 物料类型 */ + @Excel(name = "物料类型") + private String materialType; + + /** 计量单位 */ + @Excel(name = "计量单位") + private String materialUnit; + + /** MATKL */ + @Excel(name = "MATKL") + private String materialMatkl; + + /** 物料规格 */ + @Excel(name = "物料规格") + private Long materialSpecifications; + + /** 所属工厂编号 */ + @Excel(name = "所属工厂编号") + private String plantCode; + + /** + * 所属工厂名称 + */ + @Excel(name = "所属工厂名称") + private String plantName; + + /** 产线工位编号 */ + @Excel(name = "产线工位编号") + private String productLineCode; + + /** 产线工位名称 */ + @Excel(name = "产线工位名称") + private String productLineName; + + /** 启用标识 */ + @Excel(name = "启用标识") + private Long isFlag; + + /** 创建人 */ + @Excel(name = "创建人") + private String createdBy; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; + + /** 更新人 */ + @Excel(name = "更新人") + private String updatedBy; + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date updatedTime; + + + public Long getObjId() { + return objId; + } + + public void setObjId(Long objId) { + this.objId = objId; + } + + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public String getMaterialCategories() { + return materialCategories; + } + + public void setMaterialCategories(String materialCategories) { + this.materialCategories = materialCategories; + } + + public String getMaterialSubclass() { + return materialSubclass; + } + + public void setMaterialSubclass(String materialSubclass) { + this.materialSubclass = materialSubclass; + } + + public String getMaterialType() { + return materialType; + } + + public void setMaterialType(String materialType) { + this.materialType = materialType; + } + + public String getMaterialUnit() { + return materialUnit; + } + + public void setMaterialUnit(String materialUnit) { + this.materialUnit = materialUnit; + } + + public String getMaterialMatkl() { + return materialMatkl; + } + + public void setMaterialMatkl(String materialMatkl) { + this.materialMatkl = materialMatkl; + } + + public Long getMaterialSpecifications() { + return materialSpecifications; + } + + public void setMaterialSpecifications(Long materialSpecifications) { + this.materialSpecifications = materialSpecifications; + } + + public String getPlantCode() { + return plantCode; + } + + public void setPlantCode(String plantCode) { + this.plantCode = plantCode; + } + + public String getPlantName() { + return plantName; + } + + public void setPlantName(String plantName) { + this.plantName = plantName; + } + + public String getProductLineCode() { + return productLineCode; + } + + public void setProductLineCode(String productLineCode) { + this.productLineCode = productLineCode; + } + + public String getProductLineName() { + return productLineName; + } + + public void setProductLineName(String productLineName) { + this.productLineName = productLineName; + } + + public Long getIsFlag() { + return isFlag; + } + + public void setIsFlag(Long isFlag) { + this.isFlag = isFlag; + } + + public String getCreatedBy() { + return createdBy; + } + + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + public Date getCreatedTime() { + return createdTime; + } + + public void setCreatedTime(Date createdTime) { + this.createdTime = createdTime; + } + + public String getUpdatedBy() { + return updatedBy; + } + + public void setUpdatedBy(String updatedBy) { + this.updatedBy = updatedBy; + } + + public Date getUpdatedTime() { + return updatedTime; + } + + public void setUpdatedTime(Date updatedTime) { + this.updatedTime = updatedTime; + } + + @Override + public String toString() { + return "BaseMaterialInfo{" + + "objId=" + objId + + ", materialCode='" + materialCode + '\'' + + ", materialName='" + materialName + '\'' + + ", materialCategories='" + materialCategories + '\'' + + ", materialSubclass='" + materialSubclass + '\'' + + ", materialType='" + materialType + '\'' + + ", materialUnit='" + materialUnit + '\'' + + ", materialMatkl='" + materialMatkl + '\'' + + ", materialSpecifications=" + materialSpecifications + + ", plantCode='" + plantCode + '\'' + + ", plantName='" + plantName + '\'' + + ", productLineCode='" + productLineCode + '\'' + + ", productLineName='" + productLineName + '\'' + + ", isFlag=" + isFlag + + ", createdBy='" + createdBy + '\'' + + ", createdTime=" + createdTime + + ", updatedBy='" + updatedBy + '\'' + + ", updatedTime=" + updatedTime + + '}'; + } +} diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseProductline.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseProductLine.java similarity index 61% rename from aucma-base/src/main/java/com/aucma/base/domain/BaseProductline.java rename to aucma-base/src/main/java/com/aucma/base/domain/BaseProductLine.java index b6cdb26..f6b9ca3 100644 --- a/aucma-base/src/main/java/com/aucma/base/domain/BaseProductline.java +++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseProductLine.java @@ -12,42 +12,42 @@ import com.aucma.common.core.domain.BaseEntity; * 产线信息对象 base_productline * * @author Yinq - * @date 2023-09-18 + * @date 2023-09-19 */ -public class BaseProductline extends BaseEntity { +public class BaseProductLine extends BaseEntity { private static final long serialVersionUID = 1L; /** * 主键标识 */ - private Long objid; + private Long objId; /** * 产线编号 */ @Excel(name = "产线编号") - private String productlineCode; + private String productLineCode; /** * 产线名称 */ @Excel(name = "产线名称") - private String productlineName; + private String productLineName; /** * 产线类别（1-产线；2-工位） */ - @Excel(name = "产线类别" , readConverterExp = "1=-产线；2-工位") - private Long productlineType; + @Excel(name = "产线类别", readConverterExp = "1=-产线；2-工位") + private Long productLineType; /** - * 所属工厂 + * 所属工厂编号 */ @Excel(name = "所属工厂编号") private String plantCode; /** - * 所属工厂 + * 所属工厂名称 */ @Excel(name = "所属工厂名称") private String plantName; @@ -68,7 +68,7 @@ public class BaseProductline extends BaseEntity { * 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date createdTime; /** @@ -81,7 +81,7 @@ public class BaseProductline extends BaseEntity { * 更新时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "更新时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date updatedTime; @@ -93,36 +93,36 @@ public class BaseProductline extends BaseEntity { this.plantName = plantName; } - public void setObjid(Long objid) { - this.objid = objid; + public void setObjId(Long objId) { + this.objId = objId; } - public Long getObjid() { - return objid; + public Long getObjId() { + return objId; } - public void setProductlineCode(String productlineCode) { - this.productlineCode = productlineCode; + public void setProductLineCode(String productLineCode) { + this.productLineCode = productLineCode; } - public String getProductlineCode() { - return productlineCode; + public String getProductLineCode() { + return productLineCode; } - public void setProductlineName(String productlineName) { - this.productlineName = productlineName; + public void setProductLineName(String productLineName) { + this.productLineName = productLineName; } - public String getProductlineName() { - return productlineName; + public String getProductLineName() { + return productLineName; } - public void setProductlineType(Long productlineType) { - this.productlineType = productlineType; + public void setProductLineType(Long productLineType) { + this.productLineType = productLineType; } - public Long getProductlineType() { - return productlineType; + public Long getProductLineType() { + return productLineType; } public void setPlantCode(String plantCode) { @@ -176,16 +176,16 @@ public class BaseProductline extends BaseEntity { @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("objid" , getObjid()) - .append("productlineCode" , getProductlineCode()) - .append("productlineName" , getProductlineName()) - .append("productlineType" , getProductlineType()) - .append("plantCode" , getPlantCode()) - .append("isFlag" , getIsFlag()) - .append("createdBy" , getCreatedBy()) - .append("createdTime" , getCreatedTime()) - .append("updatedBy" , getUpdatedBy()) - .append("updatedTime" , getUpdatedTime()) + .append("objId", getObjId()) + .append("productLineCode", getProductLineCode()) + .append("productLineName", getProductLineName()) + .append("productLineType", getProductLineType()) + .append("plantCode", getPlantCode()) + .append("isFlag", getIsFlag()) + .append("createdBy", getCreatedBy()) + .append("createdTime", getCreatedTime()) + .append("updatedBy", getUpdatedBy()) + .append("updatedTime", getUpdatedTime()) .toString(); } } diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseMaterialinfoMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseMaterialinfoMapper.java new file mode 100644 index 0000000..1ae17a3 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/mapper/BaseMaterialinfoMapper.java @@ -0,0 +1,61 @@ +package com.aucma.base.mapper; + +import java.util.List; +import com.aucma.base.domain.BaseMaterialInfo; + +/** + * 物料信息Mapper接口 + * + * @author Yinq + * @date 2023-09-19 + */ +public interface BaseMaterialInfoMapper +{ + /** + * 查询物料信息 + * + * @param objId 物料信息主键 + * @return 物料信息 + */ + public BaseMaterialInfo selectBaseMaterialInfoByObjId(Long objId); + + /** + * 查询物料信息列表 + * + * @param baseMaterialInfo 物料信息 + * @return 物料信息集合 + */ + public List selectBaseMaterialInfoList(BaseMaterialInfo baseMaterialInfo); + + /** + * 新增物料信息 + * + * @param baseMaterialInfo 物料信息 + * @return 结果 + */ + public int insertBaseMaterialInfo(BaseMaterialInfo baseMaterialInfo); + + /** + * 修改物料信息 + * + * @param baseMaterialInfo 物料信息 + * @return 结果 + */ + public int updateBaseMaterialInfo(BaseMaterialInfo baseMaterialInfo); + + /** + * 删除物料信息 + * + * @param objId 物料信息主键 + * @return 结果 + */ + public int deleteBaseMaterialInfoByObjId(Long objId); + + /** + * 批量删除物料信息 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseMaterialInfoByObjIds(Long[] objIds); +} diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseProductLineMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseProductLineMapper.java new file mode 100644 index 0000000..cec0c17 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/mapper/BaseProductLineMapper.java @@ -0,0 +1,61 @@ +package com.aucma.base.mapper; + +import java.util.List; +import com.aucma.base.domain.BaseProductLine; + +/** + * 产线信息Mapper接口 + * + * @author Yinq + * @date 2023-09-19 + */ +public interface BaseProductLineMapper +{ + /** + * 查询产线信息 + * + * @param objId 产线信息主键 + * @return 产线信息 + */ + public BaseProductLine selectBaseProductLineByObjId(Long objId); + + /** + * 查询产线信息列表 + * + * @param baseProductLine 产线信息 + * @return 产线信息集合 + */ + public List selectBaseProductLineList(BaseProductLine baseProductLine); + + /** + * 新增产线信息 + * + * @param baseProductLine 产线信息 + * @return 结果 + */ + public int insertBaseProductLine(BaseProductLine baseProductLine); + + /** + * 修改产线信息 + * + * @param baseProductLine 产线信息 + * @return 结果 + */ + public int updateBaseProductLine(BaseProductLine baseProductLine); + + /** + * 删除产线信息 + * + * @param objId 产线信息主键 + * @return 结果 + */ + public int deleteBaseProductLineByObjId(Long objId); + + /** + * 批量删除产线信息 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseProductLineByObjIds(Long[] objIds); +} diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseProductlineMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseProductlineMapper.java deleted file mode 100644 index 2c6944b..0000000 --- a/aucma-base/src/main/java/com/aucma/base/mapper/BaseProductlineMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.aucma.base.mapper; - -import java.util.List; -import com.aucma.base.domain.BaseProductline; - -/** - * 产线信息Mapper接口 - * - * @author Yinq - * @date 2023-09-18 - */ -public interface BaseProductlineMapper -{ - /** - * 查询产线信息 - * - * @param objid 产线信息主键 - * @return 产线信息 - */ - public BaseProductline selectBaseProductlineByObjid(Long objid); - - /** - * 查询产线信息列表 - * - * @param baseProductline 产线信息 - * @return 产线信息集合 - */ - public List selectBaseProductlineList(BaseProductline baseProductline); - - /** - * 新增产线信息 - * - * @param baseProductline 产线信息 - * @return 结果 - */ - public int insertBaseProductline(BaseProductline baseProductline); - - /** - * 修改产线信息 - * - * @param baseProductline 产线信息 - * @return 结果 - */ - public int updateBaseProductline(BaseProductline baseProductline); - - /** - * 删除产线信息 - * - * @param objid 产线信息主键 - * @return 结果 - */ - public int deleteBaseProductlineByObjid(Long objid); - - /** - * 批量删除产线信息 - * - * @param objids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBaseProductlineByObjids(Long[] objids); -} diff --git a/aucma-base/src/main/java/com/aucma/base/service/IBaseMaterialinfoService.java b/aucma-base/src/main/java/com/aucma/base/service/IBaseMaterialinfoService.java new file mode 100644 index 0000000..f6a0af7 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/service/IBaseMaterialinfoService.java @@ -0,0 +1,61 @@ +package com.aucma.base.service; + +import java.util.List; +import com.aucma.base.domain.BaseMaterialInfo; + +/** + * 物料信息Service接口 + * + * @author Yinq + * @date 2023-09-19 + */ +public interface IBaseMaterialInfoService +{ + /** + * 查询物料信息 + * + * @param objId 物料信息主键 + * @return 物料信息 + */ + public BaseMaterialInfo selectBaseMaterialInfoByObjId(Long objId); + + /** + * 查询物料信息列表 + * + * @param baseMaterialInfo 物料信息 + * @return 物料信息集合 + */ + public List selectBaseMaterialInfoList(BaseMaterialInfo baseMaterialInfo); + + /** + * 新增物料信息 + * + * @param baseMaterialInfo 物料信息 + * @return 结果 + */ + public int insertBaseMaterialInfo(BaseMaterialInfo baseMaterialInfo); + + /** + * 修改物料信息 + * + * @param baseMaterialInfo 物料信息 + * @return 结果 + */ + public int updateBaseMaterialInfo(BaseMaterialInfo baseMaterialInfo); + + /** + * 批量删除物料信息 + * + * @param objIds 需要删除的物料信息主键集合 + * @return 结果 + */ + public int deleteBaseMaterialInfoByObjIds(Long[] objIds); + + /** + * 删除物料信息信息 + * + * @param objId 物料信息主键 + * @return 结果 + */ + public int deleteBaseMaterialInfoByObjId(Long objId); +} diff --git a/aucma-base/src/main/java/com/aucma/base/service/IBaseProductLineService.java b/aucma-base/src/main/java/com/aucma/base/service/IBaseProductLineService.java new file mode 100644 index 0000000..f86e2e6 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/service/IBaseProductLineService.java @@ -0,0 +1,61 @@ +package com.aucma.base.service; + +import java.util.List; +import com.aucma.base.domain.BaseProductLine; + +/** + * 产线信息Service接口 + * + * @author Yinq + * @date 2023-09-19 + */ +public interface IBaseProductLineService +{ + /** + * 查询产线信息 + * + * @param objId 产线信息主键 + * @return 产线信息 + */ + public BaseProductLine selectBaseProductLineByObjId(Long objId); + + /** + * 查询产线信息列表 + * + * @param baseProductLine 产线信息 + * @return 产线信息集合 + */ + public List selectBaseProductLineList(BaseProductLine baseProductLine); + + /** + * 新增产线信息 + * + * @param baseProductLine 产线信息 + * @return 结果 + */ + public int insertBaseProductLine(BaseProductLine baseProductLine); + + /** + * 修改产线信息 + * + * @param baseProductLine 产线信息 + * @return 结果 + */ + public int updateBaseProductLine(BaseProductLine baseProductLine); + + /** + * 批量删除产线信息 + * + * @param objIds 需要删除的产线信息主键集合 + * @return 结果 + */ + public int deleteBaseProductLineByObjIds(Long[] objIds); + + /** + * 删除产线信息信息 + * + * @param objId 产线信息主键 + * @return 结果 + */ + public int deleteBaseProductLineByObjId(Long objId); +} diff --git a/aucma-base/src/main/java/com/aucma/base/service/IBaseProductlineService.java b/aucma-base/src/main/java/com/aucma/base/service/IBaseProductlineService.java deleted file mode 100644 index 67e2664..0000000 --- a/aucma-base/src/main/java/com/aucma/base/service/IBaseProductlineService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.aucma.base.service; - -import java.util.List; -import com.aucma.base.domain.BaseProductline; - -/** - * 产线信息Service接口 - * - * @author Yinq - * @date 2023-09-18 - */ -public interface IBaseProductlineService -{ - /** - * 查询产线信息 - * - * @param objid 产线信息主键 - * @return 产线信息 - */ - public BaseProductline selectBaseProductlineByObjid(Long objid); - - /** - * 查询产线信息列表 - * - * @param baseProductline 产线信息 - * @return 产线信息集合 - */ - public List selectBaseProductlineList(BaseProductline baseProductline); - - /** - * 新增产线信息 - * - * @param baseProductline 产线信息 - * @return 结果 - */ - public int insertBaseProductline(BaseProductline baseProductline); - - /** - * 修改产线信息 - * - * @param baseProductline 产线信息 - * @return 结果 - */ - public int updateBaseProductline(BaseProductline baseProductline); - - /** - * 批量删除产线信息 - * - * @param objids 需要删除的产线信息主键集合 - * @return 结果 - */ - public int deleteBaseProductlineByObjids(Long[] objids); - - /** - * 删除产线信息信息 - * - * @param objid 产线信息主键 - * @return 结果 - */ - public int deleteBaseProductlineByObjid(Long objid); -} diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMaterialinfoServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMaterialinfoServiceImpl.java new file mode 100644 index 0000000..646efc5 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMaterialinfoServiceImpl.java @@ -0,0 +1,93 @@ +package com.aucma.base.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.aucma.base.mapper.BaseMaterialInfoMapper; +import com.aucma.base.domain.BaseMaterialInfo; +import com.aucma.base.service.IBaseMaterialInfoService; + +/** + * 物料信息Service业务层处理 + * + * @author Yinq + * @date 2023-09-19 + */ +@Service +public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService +{ + @Autowired + private BaseMaterialInfoMapper baseMaterialInfoMapper; + + /** + * 查询物料信息 + * + * @param objId 物料信息主键 + * @return 物料信息 + */ + @Override + public BaseMaterialInfo selectBaseMaterialInfoByObjId(Long objId) + { + return baseMaterialInfoMapper.selectBaseMaterialInfoByObjId(objId); + } + + /** + * 查询物料信息列表 + * + * @param baseMaterialInfo 物料信息 + * @return 物料信息 + */ + @Override + public List selectBaseMaterialInfoList(BaseMaterialInfo baseMaterialInfo) + { + return baseMaterialInfoMapper.selectBaseMaterialInfoList(baseMaterialInfo); + } + + /** + * 新增物料信息 + * + * @param baseMaterialInfo 物料信息 + * @return 结果 + */ + @Override + public int insertBaseMaterialInfo(BaseMaterialInfo baseMaterialInfo) + { + return baseMaterialInfoMapper.insertBaseMaterialInfo(baseMaterialInfo); + } + + /** + * 修改物料信息 + * + * @param baseMaterialInfo 物料信息 + * @return 结果 + */ + @Override + public int updateBaseMaterialInfo(BaseMaterialInfo baseMaterialInfo) + { + return baseMaterialInfoMapper.updateBaseMaterialInfo(baseMaterialInfo); + } + + /** + * 批量删除物料信息 + * + * @param objIds 需要删除的物料信息主键 + * @return 结果 + */ + @Override + public int deleteBaseMaterialInfoByObjIds(Long[] objIds) + { + return baseMaterialInfoMapper.deleteBaseMaterialInfoByObjIds(objIds); + } + + /** + * 删除物料信息信息 + * + * @param objId 物料信息主键 + * @return 结果 + */ + @Override + public int deleteBaseMaterialInfoByObjId(Long objId) + { + return baseMaterialInfoMapper.deleteBaseMaterialInfoByObjId(objId); + } +} diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseProductLineServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseProductLineServiceImpl.java new file mode 100644 index 0000000..db4e72d --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseProductLineServiceImpl.java @@ -0,0 +1,93 @@ +package com.aucma.base.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.aucma.base.mapper.BaseProductLineMapper; +import com.aucma.base.domain.BaseProductLine; +import com.aucma.base.service.IBaseProductLineService; + +/** + * 产线信息Service业务层处理 + * + * @author Yinq + * @date 2023-09-19 + */ +@Service +public class BaseProductLineServiceImpl implements IBaseProductLineService +{ + @Autowired + private BaseProductLineMapper baseProductLineMapper; + + /** + * 查询产线信息 + * + * @param objId 产线信息主键 + * @return 产线信息 + */ + @Override + public BaseProductLine selectBaseProductLineByObjId(Long objId) + { + return baseProductLineMapper.selectBaseProductLineByObjId(objId); + } + + /** + * 查询产线信息列表 + * + * @param baseProductLine 产线信息 + * @return 产线信息 + */ + @Override + public List selectBaseProductLineList(BaseProductLine baseProductLine) + { + return baseProductLineMapper.selectBaseProductLineList(baseProductLine); + } + + /** + * 新增产线信息 + * + * @param baseProductLine 产线信息 + * @return 结果 + */ + @Override + public int insertBaseProductLine(BaseProductLine baseProductLine) + { + return baseProductLineMapper.insertBaseProductLine(baseProductLine); + } + + /** + * 修改产线信息 + * + * @param baseProductLine 产线信息 + * @return 结果 + */ + @Override + public int updateBaseProductLine(BaseProductLine baseProductLine) + { + return baseProductLineMapper.updateBaseProductLine(baseProductLine); + } + + /** + * 批量删除产线信息 + * + * @param objIds 需要删除的产线信息主键 + * @return 结果 + */ + @Override + public int deleteBaseProductLineByObjIds(Long[] objIds) + { + return baseProductLineMapper.deleteBaseProductLineByObjIds(objIds); + } + + /** + * 删除产线信息信息 + * + * @param objId 产线信息主键 + * @return 结果 + */ + @Override + public int deleteBaseProductLineByObjId(Long objId) + { + return baseProductLineMapper.deleteBaseProductLineByObjId(objId); + } +} diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseProductlineServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseProductlineServiceImpl.java deleted file mode 100644 index 333e8dd..0000000 --- a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseProductlineServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.aucma.base.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.aucma.base.mapper.BaseProductlineMapper; -import com.aucma.base.domain.BaseProductline; -import com.aucma.base.service.IBaseProductlineService; - -/** - * 产线信息Service业务层处理 - * - * @author Yinq - * @date 2023-09-18 - */ -@Service -public class BaseProductlineServiceImpl implements IBaseProductlineService -{ - @Autowired - private BaseProductlineMapper baseProductlineMapper; - - /** - * 查询产线信息 - * - * @param objid 产线信息主键 - * @return 产线信息 - */ - @Override - public BaseProductline selectBaseProductlineByObjid(Long objid) - { - return baseProductlineMapper.selectBaseProductlineByObjid(objid); - } - - /** - * 查询产线信息列表 - * - * @param baseProductline 产线信息 - * @return 产线信息 - */ - @Override - public List selectBaseProductlineList(BaseProductline baseProductline) - { - return baseProductlineMapper.selectBaseProductlineList(baseProductline); - } - - /** - * 新增产线信息 - * - * @param baseProductline 产线信息 - * @return 结果 - */ - @Override - public int insertBaseProductline(BaseProductline baseProductline) - { - return baseProductlineMapper.insertBaseProductline(baseProductline); - } - - /** - * 修改产线信息 - * - * @param baseProductline 产线信息 - * @return 结果 - */ - @Override - public int updateBaseProductline(BaseProductline baseProductline) - { - return baseProductlineMapper.updateBaseProductline(baseProductline); - } - - /** - * 批量删除产线信息 - * - * @param objids 需要删除的产线信息主键 - * @return 结果 - */ - @Override - public int deleteBaseProductlineByObjids(Long[] objids) - { - return baseProductlineMapper.deleteBaseProductlineByObjids(objids); - } - - /** - * 删除产线信息信息 - * - * @param objid 产线信息主键 - * @return 结果 - */ - @Override - public int deleteBaseProductlineByObjid(Long objid) - { - return baseProductlineMapper.deleteBaseProductlineByObjid(objid); - } -} diff --git a/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml new file mode 100644 index 0000000..9f652db --- /dev/null +++ b/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select ml.obj_id, + ml.material_code, + ml.material_name, + ml.material_categories, + ml.material_subclass, + ml.material_type, + ml.material_unit, + ml.material_matkl, + ml.material_specifications, + ml.plant_code, + bf.factory_name plantName, + ml.productline_code, + bpl.PRODUCT_LINE_NAME productLineName, + ml.is_flag, + ml.created_by, + ml.created_time, + ml.updated_by, + ml.updated_time + from base_materialinfo ml + left join base_factory bf on bf.factory_code = ml.plant_code + left join base_productline bpl on bpl.PRODUCT_LINE_CODE = ml.productline_code + + + + + + + + + SELECT seq_base_materialinfo.NEXTVAL as objId FROM DUAL + + insert into base_materialinfo + + obj_id, + material_code, + material_name, + material_categories, + material_subclass, + material_type, + material_unit, + material_matkl, + material_specifications, + plant_code, + productline_code, + is_flag, + created_by, + created_time, + updated_by, + updated_time, + + + #{objId}, + #{materialCode}, + #{materialName}, + #{materialCategories}, + #{materialSubclass}, + #{materialType}, + #{materialUnit}, + #{materialMatkl}, + #{materialSpecifications}, + #{plantCode}, + #{productLineCode}, + #{isFlag}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + + + + + update base_materialinfo + + material_code = #{materialCode}, + material_name = #{materialName}, + material_categories = #{materialCategories}, + material_subclass = #{materialSubclass}, + material_type = #{materialType}, + material_unit = #{materialUnit}, + material_matkl = #{materialMatkl}, + material_specifications = #{materialSpecifications}, + plant_code = #{plantCode}, + productline_code = #{productLineCode}, + is_flag = #{isFlag}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + + where obj_id = #{objId} + + + + delete from base_materialinfo where obj_id = #{objId} + + + + delete from base_materialinfo where obj_id in + + #{objId} + + + \ No newline at end of file diff --git a/aucma-base/src/main/resources/mapper/base/BaseProductLineMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseProductLineMapper.xml new file mode 100644 index 0000000..e56d82f --- /dev/null +++ b/aucma-base/src/main/resources/mapper/base/BaseProductLineMapper.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + select bpl.OBJ_ID, + bpl.PRODUCT_LINE_CODE, + bpl.PRODUCT_LINE_NAME, + bpl.PRODUCT_LINE_TYPE, + bpl.plant_code, + bf.factory_name plantName, + bpl.is_flag, + bpl.created_by, + bpl.created_time, + bpl.updated_by, + bpl.updated_time + from base_productline bpl + left join base_factory bf on bf.factory_code = bpl.plant_code + + + + + + + + + SELECT seq_base_productline.NEXTVAL as objId FROM DUAL + + insert into base_productline + + obj_id, + product_line_code, + product_line_name, + product_line_type, + plant_code, + is_flag, + created_by, + created_time, + updated_by, + updated_time, + + + #{objId}, + #{productLineCode}, + #{productLineName}, + #{productLineType}, + #{plantCode}, + #{isFlag}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + + + + + update base_productline + + product_line_code = #{productLineCode}, + product_line_name = #{productLineName}, + product_line_type = #{productLineType}, + plant_code = #{plantCode}, + is_flag = #{isFlag}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + + where obj_id = #{objId} + + + + delete from base_productline where obj_id = #{objId} + + + + delete from base_productline where obj_id in + + #{objId} + + + \ No newline at end of file diff --git a/aucma-base/src/main/resources/mapper/base/BaseProductlineMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseProductlineMapper.xml deleted file mode 100644 index 0a48696..0000000 --- a/aucma-base/src/main/resources/mapper/base/BaseProductlineMapper.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select bpl.objid, - bpl.productline_code, - bpl.productline_name, - bpl.productline_type, - bpl.plant_code, - bf.factory_name plantName, - bpl.is_flag, - bpl.created_by, - bpl.created_time, - bpl.updated_by, - bpl.updated_time - from base_productline bpl - left join base_factory bf on bf.factory_code = bpl.plant_code - - - - - - - - - SELECT seq_base_productline.NEXTVAL as objid FROM DUAL - - insert into base_productline - - objid, - productline_code, - productline_name, - productline_type, - plant_code, - is_flag, - created_by, - created_time, - updated_by, - updated_time, - - - #{objid}, - #{productlineCode}, - #{productlineName}, - #{productlineType}, - #{plantCode}, - #{isFlag}, - #{createdBy}, - #{createdTime}, - #{updatedBy}, - #{updatedTime}, - - - - - update base_productline - - productline_code = #{productlineCode}, - productline_name = #{productlineName}, - productline_type = #{productlineType}, - plant_code = #{plantCode}, - is_flag = #{isFlag}, - created_by = #{createdBy}, - created_time = #{createdTime}, - updated_by = #{updatedBy}, - updated_time = #{updatedTime}, - - where objid = #{objid} - - - - delete - from base_productline - where objid = #{objid} - - - - delete from base_productline where objid in - - #{objid} - - - \ No newline at end of file