From 7e8f989e98477eb400f9728681e3cdd0b3a31391 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Wed, 27 Sep 2023 17:32:10 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E5=B7=A5=E5=8D=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseOrderInfoController.java | 101 ++++++ .../com/aucma/base/domain/BaseOrderInfo.java | 329 ++++++++++++++++++ .../base/mapper/BaseOrderInfoMapper.java | 61 ++++ .../base/service/IBaseOrderInfoService.java | 61 ++++ .../impl/BaseOrderInfoServiceImpl.java | 90 +++++ .../mapper/base/BaseOrderInfoMapper.xml | 177 ++++++++++ 6 files changed, 819 insertions(+) create mode 100644 aucma-base/src/main/java/com/aucma/base/controller/BaseOrderInfoController.java create mode 100644 aucma-base/src/main/java/com/aucma/base/domain/BaseOrderInfo.java create mode 100644 aucma-base/src/main/java/com/aucma/base/mapper/BaseOrderInfoMapper.java create mode 100644 aucma-base/src/main/java/com/aucma/base/service/IBaseOrderInfoService.java create mode 100644 aucma-base/src/main/java/com/aucma/base/service/impl/BaseOrderInfoServiceImpl.java create mode 100644 aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml diff --git a/aucma-base/src/main/java/com/aucma/base/controller/BaseOrderInfoController.java b/aucma-base/src/main/java/com/aucma/base/controller/BaseOrderInfoController.java new file mode 100644 index 0000000..7808fc5 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/controller/BaseOrderInfoController.java @@ -0,0 +1,101 @@ +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.BaseOrderInfo; +import com.aucma.base.service.IBaseOrderInfoService; +import com.aucma.common.utils.poi.ExcelUtil; +import com.aucma.common.core.page.TableDataInfo; + +/** + * 工单信息Controller + * + * @author Yinq + * @date 2023-09-27 + */ +@RestController +@RequestMapping("/base/orderInfo") +public class BaseOrderInfoController extends BaseController { + @Autowired + private IBaseOrderInfoService baseOrderInfoService; + + /** + * 查询工单信息列表 + */ + @PreAuthorize("@ss.hasPermi('base:orderInfo:list')") + @GetMapping("/list") + public TableDataInfo list(BaseOrderInfo baseOrderInfo) { + startPage(); + List list = baseOrderInfoService.selectBaseOrderInfoList(baseOrderInfo); + return getDataTable(list); + } + + /** + * 导出工单信息列表 + */ + @PreAuthorize("@ss.hasPermi('base:orderInfo:export')") + @Log(title = "工单信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BaseOrderInfo baseOrderInfo) { + List list = baseOrderInfoService.selectBaseOrderInfoList(baseOrderInfo); + ExcelUtil util = new ExcelUtil(BaseOrderInfo.class); + util.exportExcel(response, list, "工单信息数据"); + } + + /** + * 获取工单信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('base:orderInfo:query')") + @GetMapping(value = "/{objId}") + public AjaxResult getInfo(@PathVariable("objId") Long objId) { + return success(baseOrderInfoService.selectBaseOrderInfoByObjId(objId)); + } + + /** + * 新增工单信息 + */ + @PreAuthorize("@ss.hasPermi('base:orderInfo:add')") + @Log(title = "工单信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BaseOrderInfo baseOrderInfo) { + baseOrderInfo.setCreatedBy(getUsername()); + return toAjax(baseOrderInfoService.insertBaseOrderInfo(baseOrderInfo)); + } + + /** + * 修改工单信息 + */ + @PreAuthorize("@ss.hasPermi('base:orderInfo:edit')") + @Log(title = "工单信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BaseOrderInfo baseOrderInfo) { + baseOrderInfo.setUpdatedBy(getUsername()); + return toAjax(baseOrderInfoService.updateBaseOrderInfo(baseOrderInfo)); + } + + /** + * 删除工单信息 + */ + @PreAuthorize("@ss.hasPermi('base:orderInfo:remove')") + @Log(title = "工单信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}") + public AjaxResult remove(@PathVariable Long[] objIds) { + return toAjax(baseOrderInfoService.deleteBaseOrderInfoByObjIds(objIds)); + } +} diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseOrderInfo.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseOrderInfo.java new file mode 100644 index 0000000..138b2ae --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseOrderInfo.java @@ -0,0 +1,329 @@ +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_orderinfo + * + * @author Yinq + * @date 2023-09-27 + */ +public class BaseOrderInfo extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + private Long objId; + + /** + * 工单编号 + */ + @Excel(name = "工单编号") + private String orderCode; + + /** + * 销售订单编号 + */ + @Excel(name = "销售订单编号") + private String saleOrderCode; + + /** + * 销售订单行号 + */ + @Excel(name = "销售订单行号") + private String saleOrderLineNumber; + + /** + * 物料编码 + */ + @Excel(name = "物料编码") + private String materialCode; + + /** + * 物料名称 + */ + @Excel(name = "物料名称") + private String materialName; + + /** + * 物料组 + */ + @Excel(name = "物料组") + private String matkl; + + /** + * 订单计划数量 + */ + @Excel(name = "订单计划数量") + private Long orderAmount; + + /** + * 完成数量 + */ + @Excel(name = "完成数量") + private Long completeAmount; + + /** + * 工单类型 + */ + @Excel(name = "工单类型") + private String orderType; + + /** + * 工单状态 + */ + @Excel(name = "工单状态") + private String orderStatus; + + /** + * 开始日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "开始日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date beginDate; + + /** + * 结束日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "结束日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date endDate; + + /** + * 工厂编码 + */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** + * 启用标识 + */ + @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; + + /** + * 完成日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "完成日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date completeDate; + + public void setObjId(Long objId) { + this.objId = objId; + } + + public Long getObjId() { + return objId; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderCode() { + return orderCode; + } + + public void setSaleOrderCode(String saleOrderCode) { + this.saleOrderCode = saleOrderCode; + } + + public String getSaleOrderCode() { + return saleOrderCode; + } + + public void setSaleOrderLineNumber(String saleOrderLineNumber) { + this.saleOrderLineNumber = saleOrderLineNumber; + } + + public String getSaleOrderLineNumber() { + return saleOrderLineNumber; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public String getMaterialName() { + return materialName; + } + + public void setMatkl(String matkl) { + this.matkl = matkl; + } + + public String getMatkl() { + return matkl; + } + + public void setOrderAmount(Long orderAmount) { + this.orderAmount = orderAmount; + } + + public Long getOrderAmount() { + return orderAmount; + } + + public void setCompleteAmount(Long completeAmount) { + this.completeAmount = completeAmount; + } + + public Long getCompleteAmount() { + return completeAmount; + } + + public void setOrderType(String orderType) { + this.orderType = orderType; + } + + public String getOrderType() { + return orderType; + } + + public void setOrderStatus(String orderStatus) { + this.orderStatus = orderStatus; + } + + public String getOrderStatus() { + return orderStatus; + } + + public void setBeginDate(Date beginDate) { + this.beginDate = beginDate; + } + + public Date getBeginDate() { + return beginDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + + public void setIsFlag(Long isFlag) { + this.isFlag = isFlag; + } + + public Long getIsFlag() { + return isFlag; + } + + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + public String getCreatedBy() { + return createdBy; + } + + public void setCreatedTime(Date createdTime) { + this.createdTime = createdTime; + } + + public Date getCreatedTime() { + return createdTime; + } + + public void setUpdatedBy(String updatedBy) { + this.updatedBy = updatedBy; + } + + public String getUpdatedBy() { + return updatedBy; + } + + public void setUpdatedTime(Date updatedTime) { + this.updatedTime = updatedTime; + } + + public Date getUpdatedTime() { + return updatedTime; + } + + public void setCompleteDate(Date completeDate) { + this.completeDate = completeDate; + } + + public Date getCompleteDate() { + return completeDate; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("orderCode", getOrderCode()) + .append("saleOrderCode", getSaleOrderCode()) + .append("saleOrderLineNumber", getSaleOrderLineNumber()) + .append("materialCode", getMaterialCode()) + .append("materialName", getMaterialName()) + .append("matkl", getMatkl()) + .append("orderAmount", getOrderAmount()) + .append("completeAmount", getCompleteAmount()) + .append("orderType", getOrderType()) + .append("orderStatus", getOrderStatus()) + .append("beginDate", getBeginDate()) + .append("endDate", getEndDate()) + .append("factoryCode", getFactoryCode()) + .append("isFlag", getIsFlag()) + .append("createdBy", getCreatedBy()) + .append("createdTime", getCreatedTime()) + .append("updatedBy", getUpdatedBy()) + .append("updatedTime", getUpdatedTime()) + .append("completeDate", getCompleteDate()) + .toString(); + } +} diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseOrderInfoMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseOrderInfoMapper.java new file mode 100644 index 0000000..7ddba90 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/mapper/BaseOrderInfoMapper.java @@ -0,0 +1,61 @@ +package com.aucma.base.mapper; + +import java.util.List; + +import com.aucma.base.domain.BaseOrderInfo; + +/** + * 工单信息Mapper接口 + * + * @author Yinq + * @date 2023-09-27 + */ +public interface BaseOrderInfoMapper { + /** + * 查询工单信息 + * + * @param objId 工单信息主键 + * @return 工单信息 + */ + public BaseOrderInfo selectBaseOrderInfoByObjId(Long objId); + + /** + * 查询工单信息列表 + * + * @param baseOrderInfo 工单信息 + * @return 工单信息集合 + */ + public List selectBaseOrderInfoList(BaseOrderInfo baseOrderInfo); + + /** + * 新增工单信息 + * + * @param baseOrderInfo 工单信息 + * @return 结果 + */ + public int insertBaseOrderInfo(BaseOrderInfo baseOrderInfo); + + /** + * 修改工单信息 + * + * @param baseOrderInfo 工单信息 + * @return 结果 + */ + public int updateBaseOrderInfo(BaseOrderInfo baseOrderInfo); + + /** + * 删除工单信息 + * + * @param objId 工单信息主键 + * @return 结果 + */ + public int deleteBaseOrderInfoByObjId(Long objId); + + /** + * 批量删除工单信息 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseOrderInfoByObjIds(Long[] objIds); +} diff --git a/aucma-base/src/main/java/com/aucma/base/service/IBaseOrderInfoService.java b/aucma-base/src/main/java/com/aucma/base/service/IBaseOrderInfoService.java new file mode 100644 index 0000000..f328658 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/service/IBaseOrderInfoService.java @@ -0,0 +1,61 @@ +package com.aucma.base.service; + +import java.util.List; + +import com.aucma.base.domain.BaseOrderInfo; + +/** + * 工单信息Service接口 + * + * @author Yinq + * @date 2023-09-27 + */ +public interface IBaseOrderInfoService { + /** + * 查询工单信息 + * + * @param objId 工单信息主键 + * @return 工单信息 + */ + public BaseOrderInfo selectBaseOrderInfoByObjId(Long objId); + + /** + * 查询工单信息列表 + * + * @param baseOrderInfo 工单信息 + * @return 工单信息集合 + */ + public List selectBaseOrderInfoList(BaseOrderInfo baseOrderInfo); + + /** + * 新增工单信息 + * + * @param baseOrderInfo 工单信息 + * @return 结果 + */ + public int insertBaseOrderInfo(BaseOrderInfo baseOrderInfo); + + /** + * 修改工单信息 + * + * @param baseOrderInfo 工单信息 + * @return 结果 + */ + public int updateBaseOrderInfo(BaseOrderInfo baseOrderInfo); + + /** + * 批量删除工单信息 + * + * @param objIds 需要删除的工单信息主键集合 + * @return 结果 + */ + public int deleteBaseOrderInfoByObjIds(Long[] objIds); + + /** + * 删除工单信息信息 + * + * @param objId 工单信息主键 + * @return 结果 + */ + public int deleteBaseOrderInfoByObjId(Long objId); +} diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseOrderInfoServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseOrderInfoServiceImpl.java new file mode 100644 index 0000000..88099bc --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseOrderInfoServiceImpl.java @@ -0,0 +1,90 @@ +package com.aucma.base.service.impl; + +import java.util.List; + +import com.aucma.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.aucma.base.mapper.BaseOrderInfoMapper; +import com.aucma.base.domain.BaseOrderInfo; +import com.aucma.base.service.IBaseOrderInfoService; + +/** + * 工单信息Service业务层处理 + * + * @author Yinq + * @date 2023-09-27 + */ +@Service +public class BaseOrderInfoServiceImpl implements IBaseOrderInfoService { + @Autowired + private BaseOrderInfoMapper baseOrderInfoMapper; + + /** + * 查询工单信息 + * + * @param objId 工单信息主键 + * @return 工单信息 + */ + @Override + public BaseOrderInfo selectBaseOrderInfoByObjId(Long objId) { + return baseOrderInfoMapper.selectBaseOrderInfoByObjId(objId); + } + + /** + * 查询工单信息列表 + * + * @param baseOrderInfo 工单信息 + * @return 工单信息 + */ + @Override + public List selectBaseOrderInfoList(BaseOrderInfo baseOrderInfo) { + return baseOrderInfoMapper.selectBaseOrderInfoList(baseOrderInfo); + } + + /** + * 新增工单信息 + * + * @param baseOrderInfo 工单信息 + * @return 结果 + */ + @Override + public int insertBaseOrderInfo(BaseOrderInfo baseOrderInfo) { + baseOrderInfo.setCreatedTime(DateUtils.getNowDate()); + return baseOrderInfoMapper.insertBaseOrderInfo(baseOrderInfo); + } + + /** + * 修改工单信息 + * + * @param baseOrderInfo 工单信息 + * @return 结果 + */ + @Override + public int updateBaseOrderInfo(BaseOrderInfo baseOrderInfo) { + baseOrderInfo.setUpdatedTime(DateUtils.getNowDate()); + return baseOrderInfoMapper.updateBaseOrderInfo(baseOrderInfo); + } + + /** + * 批量删除工单信息 + * + * @param objIds 需要删除的工单信息主键 + * @return 结果 + */ + @Override + public int deleteBaseOrderInfoByObjIds(Long[] objIds) { + return baseOrderInfoMapper.deleteBaseOrderInfoByObjIds(objIds); + } + + /** + * 删除工单信息信息 + * + * @param objId 工单信息主键 + * @return 结果 + */ + @Override + public int deleteBaseOrderInfoByObjId(Long objId) { + return baseOrderInfoMapper.deleteBaseOrderInfoByObjId(objId); + } +} diff --git a/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml new file mode 100644 index 0000000..4879b0f --- /dev/null +++ b/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select obj_id, + order_code, + saleorder_code, + saleorder_linenumber, + material_code, + material_name, + matkl, + order_amount, + complete_amount, + order_type, + order_status, + begin_date, + end_date, + factory_code, + is_flag, + created_by, + created_time, + updated_by, + updated_time, + complete_date + from base_orderinfo + + + + + + + + + SELECT seq_base_orderinfo.NEXTVAL as objId FROM DUAL + + insert into base_orderinfo + + obj_id, + order_code, + saleorder_code, + saleorder_linenumber, + material_code, + material_name, + matkl, + order_amount, + complete_amount, + order_type, + order_status, + begin_date, + end_date, + factory_code, + is_flag, + created_by, + created_time, + updated_by, + updated_time, + complete_date, + + + #{objId}, + #{orderCode}, + #{saleOrderCode}, + #{saleOrderLineNumber}, + #{materialCode}, + #{materialName}, + #{matkl}, + #{orderAmount}, + #{completeAmount}, + #{orderType}, + #{orderStatus}, + #{beginDate}, + #{endDate}, + #{factoryCode}, + #{isFlag}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + #{completeDate}, + + + + + update base_orderinfo + + order_code = #{orderCode}, + saleorder_code = #{saleOrderCode}, + saleorder_linenumber = #{saleOrderLineNumber}, + material_code = #{materialCode}, + material_name = #{materialName}, + matkl = #{matkl}, + order_amount = #{orderAmount}, + complete_amount = #{completeAmount}, + order_type = #{orderType}, + order_status = #{orderStatus}, + begin_date = #{beginDate}, + end_date = #{endDate}, + factory_code = #{factoryCode}, + is_flag = #{isFlag}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + complete_date = #{completeDate}, + + where obj_id = #{objId} + + + + delete + from base_orderinfo + where obj_id = #{objId} + + + + delete from base_orderinfo where obj_id in + + #{objId} + + + \ No newline at end of file