From df1baa40f73f82c84b1988709cdc088ba5db8217 Mon Sep 17 00:00:00 2001 From: wangcl Date: Wed, 22 Dec 2021 16:08:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busi/controller/BusiOrderController.java | 126 ++++++++++++ .../java/com/ruoyi/busi/domain/BusiOrder.java | 167 ++++++++++++++++ .../ruoyi/busi/domain/BusiProductRequire.java | 114 +++++++++++ .../ruoyi/busi/mapper/BusiOrderMapper.java | 87 +++++++++ .../ruoyi/busi/service/IBusiOrderService.java | 61 ++++++ .../service/impl/BusiOrderServiceImpl.java | 134 +++++++++++++ .../src/main/resources/application-druid.yml | 113 +++++------ .../resources/mapper/busi/BusiOrderMapper.xml | 141 ++++++++++++++ .../mapper/busi/BusiPrisonLineMapper.xml | 4 +- .../resources/templates/busi/order/add.html | 181 +++++++++++++++++ .../resources/templates/busi/order/edit.html | 184 ++++++++++++++++++ .../resources/templates/busi/order/order.html | 153 +++++++++++++++ .../templates/busi/prisonLine/prisonLine.html | 2 +- sql/busi_20211108.sql | 26 ++- sql/tmp.sql | 25 +++ 15 files changed, 1458 insertions(+), 60 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiOrderController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiOrder.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProductRequire.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiOrderMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiOrderService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiOrderServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/busi/BusiOrderMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/busi/order/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/busi/order/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/busi/order/order.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiOrderController.java new file mode 100644 index 000000000..10de71e3e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiOrderController.java @@ -0,0 +1,126 @@ +package com.ruoyi.busi.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.busi.domain.BusiOrder; +import com.ruoyi.busi.service.IBusiOrderService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 订单Controller + * + * @author WangCL + * @date 2021-12-21 + */ +@Controller +@RequestMapping("/busi/order") +public class BusiOrderController extends BaseController +{ + private String prefix = "busi/order"; + + @Autowired + private IBusiOrderService busiOrderService; + + @RequiresPermissions("busi:order:view") + @GetMapping() + public String order() + { + return prefix + "/order"; + } + + /** + * 查询订单列表 + */ + @RequiresPermissions("busi:order:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BusiOrder busiOrder) + { + startPage(); + List list = busiOrderService.selectBusiOrderList(busiOrder); + return getDataTable(list); + } + + /** + * 导出订单列表 + */ + @RequiresPermissions("busi:order:export") + @Log(title = "订单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BusiOrder busiOrder) + { + List list = busiOrderService.selectBusiOrderList(busiOrder); + ExcelUtil util = new ExcelUtil(BusiOrder.class); + return util.exportExcel(list, "订单数据"); + } + + /** + * 新增订单 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存订单 + */ + @RequiresPermissions("busi:order:add") + @Log(title = "订单", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BusiOrder busiOrder) + { + return toAjax(busiOrderService.insertBusiOrder(busiOrder)); + } + + /** + * 修改订单 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) + { + BusiOrder busiOrder = busiOrderService.selectBusiOrderById(id); + mmap.put("busiOrder", busiOrder); + return prefix + "/edit"; + } + + /** + * 修改保存订单 + */ + @RequiresPermissions("busi:order:edit") + @Log(title = "订单", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BusiOrder busiOrder) + { + return toAjax(busiOrderService.updateBusiOrder(busiOrder)); + } + + /** + * 删除订单 + */ + @RequiresPermissions("busi:order:remove") + @Log(title = "订单", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(busiOrderService.deleteBusiOrderByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiOrder.java new file mode 100644 index 000000000..a32752b70 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiOrder.java @@ -0,0 +1,167 @@ +package com.ruoyi.busi.domain; + +import java.math.BigDecimal; +import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 订单对象 busi_order + * + * @author WangCL + * @date 2021-12-21 + */ +public class BusiOrder extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID主键 */ + private String id; + + /** 客户公司ID */ + private String companyId; + + /** 客户公司名称 */ + @Excel(name = "客户公司") + private String companyName; + + /** 订单名称 */ + @Excel(name = "订单名称") + private String orderName; + + /** 款号标识码 */ + @Excel(name = "款号标识码") + private String identificationCode; + + /** 订单价格 */ + @Excel(name = "订单价格") + private BigDecimal price; + + /** 类型 */ + @Excel(name = "类型") + private String classify; + + /** 转换比例(米/件) */ + @Excel(name = "转换比例(米/件)") + private BigDecimal ratio; + + /** 状态 */ + @Excel(name = "状态") + private String status; + + /** 产品需求信息 */ + private List busiProductRequireList; + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setCompanyId(String companyId) + { + this.companyId = companyId; + } + + public String getCompanyId() + { + return companyId; + } + public void setOrderName(String orderName) + { + this.orderName = orderName; + } + + public String getOrderName() + { + return orderName; + } + public void setIdentificationCode(String identificationCode) + { + this.identificationCode = identificationCode; + } + + public String getIdentificationCode() + { + return identificationCode; + } + public void setPrice(BigDecimal price) + { + this.price = price; + } + + public BigDecimal getPrice() + { + return price; + } + public void setClassify(String classify) + { + this.classify = classify; + } + + public String getClassify() + { + return classify; + } + public void setRatio(BigDecimal ratio) + { + this.ratio = ratio; + } + + public BigDecimal getRatio() + { + return ratio; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + public String getCompanyName() { + return companyName; + } + + public void setCompanyName(String companyName) { + this.companyName = companyName; + } + + public List getBusiProductRequireList() + { + return busiProductRequireList; + } + + public void setBusiProductRequireList(List busiProductRequireList) + { + this.busiProductRequireList = busiProductRequireList; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("companyId", getCompanyId()) + .append("companyName", getCompanyName()) + .append("orderName", getOrderName()) + .append("identificationCode", getIdentificationCode()) + .append("price", getPrice()) + .append("classify", getClassify()) + .append("ratio", getRatio()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("busiProductRequireList", getBusiProductRequireList()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProductRequire.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProductRequire.java new file mode 100644 index 000000000..34b870e04 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProductRequire.java @@ -0,0 +1,114 @@ +package com.ruoyi.busi.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.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 产品需求对象 busi_product_require + * + * @author WangCL + * @date 2021-12-21 + */ +public class BusiProductRequire extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID主键 */ + private String id; + + /** 订单名称 */ + @Excel(name = "订单名称") + private String orderId; + + /** 数量 */ + @Excel(name = "数量") + private Long amount; + + /** 尺码 */ + @Excel(name = "尺码") + private String size; + + /** 颜色 */ + @Excel(name = "颜色") + private String color; + + /** 截止日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "截止日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date endDate; + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setOrderId(String orderId) + { + this.orderId = orderId; + } + + public String getOrderId() + { + return orderId; + } + public void setAmount(Long amount) + { + this.amount = amount; + } + + public Long getAmount() + { + return amount; + } + public void setSize(String size) + { + this.size = size; + } + + public String getSize() + { + return size; + } + public void setColor(String color) + { + this.color = color; + } + + public String getColor() + { + return color; + } + public void setEndDate(Date endDate) + { + this.endDate = endDate; + } + + public Date getEndDate() + { + return endDate; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("orderId", getOrderId()) + .append("amount", getAmount()) + .append("size", getSize()) + .append("color", getColor()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("endDate", getEndDate()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiOrderMapper.java new file mode 100644 index 000000000..9ff2c488c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiOrderMapper.java @@ -0,0 +1,87 @@ +package com.ruoyi.busi.mapper; + +import java.util.List; +import com.ruoyi.busi.domain.BusiOrder; +import com.ruoyi.busi.domain.BusiProductRequire; + +/** + * 订单Mapper接口 + * + * @author WangCL + * @date 2021-12-21 + */ +public interface BusiOrderMapper +{ + /** + * 查询订单 + * + * @param id 订单主键 + * @return 订单 + */ + public BusiOrder selectBusiOrderById(String id); + + /** + * 查询订单列表 + * + * @param busiOrder 订单 + * @return 订单集合 + */ + public List selectBusiOrderList(BusiOrder busiOrder); + + /** + * 新增订单 + * + * @param busiOrder 订单 + * @return 结果 + */ + public int insertBusiOrder(BusiOrder busiOrder); + + /** + * 修改订单 + * + * @param busiOrder 订单 + * @return 结果 + */ + public int updateBusiOrder(BusiOrder busiOrder); + + /** + * 删除订单 + * + * @param id 订单主键 + * @return 结果 + */ + public int deleteBusiOrderById(String id); + + /** + * 批量删除订单 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBusiOrderByIds(String[] ids); + + /** + * 批量删除产品需求 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBusiProductRequireByOrderIds(String[] ids); + + /** + * 批量新增产品需求 + * + * @param busiProductRequireList 产品需求列表 + * @return 结果 + */ + public int batchBusiProductRequire(List busiProductRequireList); + + + /** + * 通过订单主键删除产品需求信息 + * + * @param id 订单ID + * @return 结果 + */ + public int deleteBusiProductRequireByOrderId(String id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiOrderService.java new file mode 100644 index 000000000..b1447c906 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiOrderService.java @@ -0,0 +1,61 @@ +package com.ruoyi.busi.service; + +import java.util.List; +import com.ruoyi.busi.domain.BusiOrder; + +/** + * 订单Service接口 + * + * @author WangCL + * @date 2021-12-21 + */ +public interface IBusiOrderService +{ + /** + * 查询订单 + * + * @param id 订单主键 + * @return 订单 + */ + public BusiOrder selectBusiOrderById(String id); + + /** + * 查询订单列表 + * + * @param busiOrder 订单 + * @return 订单集合 + */ + public List selectBusiOrderList(BusiOrder busiOrder); + + /** + * 新增订单 + * + * @param busiOrder 订单 + * @return 结果 + */ + public int insertBusiOrder(BusiOrder busiOrder); + + /** + * 修改订单 + * + * @param busiOrder 订单 + * @return 结果 + */ + public int updateBusiOrder(BusiOrder busiOrder); + + /** + * 批量删除订单 + * + * @param ids 需要删除的订单主键集合 + * @return 结果 + */ + public int deleteBusiOrderByIds(String ids); + + /** + * 删除订单信息 + * + * @param id 订单主键 + * @return 结果 + */ + public int deleteBusiOrderById(String id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiOrderServiceImpl.java new file mode 100644 index 000000000..b109c3be1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiOrderServiceImpl.java @@ -0,0 +1,134 @@ +package com.ruoyi.busi.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.ArrayList; +import com.ruoyi.common.utils.StringUtils; +import org.springframework.transaction.annotation.Transactional; +import com.ruoyi.busi.domain.BusiProductRequire; +import com.ruoyi.busi.mapper.BusiOrderMapper; +import com.ruoyi.busi.domain.BusiOrder; +import com.ruoyi.busi.service.IBusiOrderService; +import com.ruoyi.common.core.text.Convert; + +/** + * 订单Service业务层处理 + * + * @author WangCL + * @date 2021-12-21 + */ +@Service +public class BusiOrderServiceImpl implements IBusiOrderService +{ + @Autowired + private BusiOrderMapper busiOrderMapper; + + /** + * 查询订单 + * + * @param id 订单主键 + * @return 订单 + */ + @Override + public BusiOrder selectBusiOrderById(String id) + { + return busiOrderMapper.selectBusiOrderById(id); + } + + /** + * 查询订单列表 + * + * @param busiOrder 订单 + * @return 订单 + */ + @Override + public List selectBusiOrderList(BusiOrder busiOrder) + { + return busiOrderMapper.selectBusiOrderList(busiOrder); + } + + /** + * 新增订单 + * + * @param busiOrder 订单 + * @return 结果 + */ + @Transactional + @Override + public int insertBusiOrder(BusiOrder busiOrder) + { + busiOrder.setCreateTime(DateUtils.getNowDate()); + int rows = busiOrderMapper.insertBusiOrder(busiOrder); + insertBusiProductRequire(busiOrder); + return rows; + } + + /** + * 修改订单 + * + * @param busiOrder 订单 + * @return 结果 + */ + @Transactional + @Override + public int updateBusiOrder(BusiOrder busiOrder) + { + busiOrder.setUpdateTime(DateUtils.getNowDate()); + busiOrderMapper.deleteBusiProductRequireByOrderId(busiOrder.getId()); + insertBusiProductRequire(busiOrder); + return busiOrderMapper.updateBusiOrder(busiOrder); + } + + /** + * 批量删除订单 + * + * @param ids 需要删除的订单主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteBusiOrderByIds(String ids) + { + busiOrderMapper.deleteBusiProductRequireByOrderIds(Convert.toStrArray(ids)); + return busiOrderMapper.deleteBusiOrderByIds(Convert.toStrArray(ids)); + } + + /** + * 删除订单信息 + * + * @param id 订单主键 + * @return 结果 + */ + @Override + public int deleteBusiOrderById(String id) + { + busiOrderMapper.deleteBusiProductRequireByOrderId(id); + return busiOrderMapper.deleteBusiOrderById(id); + } + + /** + * 新增产品需求信息 + * + * @param busiOrder 订单对象 + */ + public void insertBusiProductRequire(BusiOrder busiOrder) + { + List busiProductRequireList = busiOrder.getBusiProductRequireList(); + String id = busiOrder.getId(); + if (StringUtils.isNotNull(busiProductRequireList)) + { + List list = new ArrayList(); + for (BusiProductRequire busiProductRequire : busiProductRequireList) + { + busiProductRequire.setOrderId(id); + list.add(busiProductRequire); + } + if (list.size() > 0) + { + busiOrderMapper.batchBusiProductRequire(list); + } + } + } +} diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index adc9dced4..958fdf637 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -1,57 +1,58 @@ -# 数据源配置 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver - druid: - # 主库数据源 - master: - url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: root - password: 12345678 - # 从库数据源 - slave: - # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: - # 初始连接数 - initialSize: 5 - # 最小连接池数量 - minIdle: 10 - # 最大连接池数量 - maxActive: 20 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 - minEvictableIdleTimeMillis: 300000 - # 配置一个连接在池中最大生存的时间，单位是毫秒 - maxEvictableIdleTimeMillis: 900000 - # 配置检测连接是否有效 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 设置白名单，不填则允许所有访问 - allow: - url-pattern: /druid/* - # 控制台管理用户名和密码 - login-username: admin - login-password: 123456 - filter: - stat: - enabled: true - # 慢SQL记录 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://49.234.33.172:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: 12345678 + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: admin + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: multi-statement-allow: true \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiOrderMapper.xml new file mode 100644 index 000000000..3785926c6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiOrderMapper.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select A.id, A.company_id, B.co_name company_name, A.order_name, A.identification_code, A.price, A.classify, A.ratio, A.status, A.create_by, A.create_time, A.update_by, A.update_time + from busi_order A LEFT JOIN busi_customer_company B on A.company_id = B.id + + + + + + + + insert into busi_order + + company_id, + order_name, + identification_code, + price, + classify, + ratio, + status, + create_by, + create_time, + update_by, + update_time, + + + #{companyId}, + #{orderName}, + #{identificationCode}, + #{price}, + #{classify}, + #{ratio}, + #{status}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update busi_order + + company_id = #{companyId}, + order_name = #{orderName}, + identification_code = #{identificationCode}, + price = #{price}, + classify = #{classify}, + ratio = #{ratio}, + status = #{status}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from busi_order where id = #{id} + + + + delete from busi_order where id in + + #{id} + + + + + delete from busi_product_require where order_id in + + #{orderId} + + + + + delete from busi_product_require where order_id = #{orderId} + + + + insert into busi_product_require( id, order_id, amount, size, color, create_by, create_time, update_by, update_time, end_date) values + + ( #{item.id}, #{item.orderId}, #{item.amount}, #{item.size}, #{item.color}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.endDate}) + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiPrisonLineMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiPrisonLineMapper.xml index f45cf3dfc..e34c9c3d4 100644 --- a/ruoyi-admin/src/main/resources/mapper/busi/BusiPrisonLineMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiPrisonLineMapper.xml @@ -21,8 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select A.id, A.pid,b.disname as pname, A.disname, A.leader, A.person_number, A.status, A.classify, A.create_by, A.create_time, A.update_by, A.update_time from busi_prison_line A - LEFT JOIN busi_prison_line B on a.pid = b.id + select A.id, A.pid,B.disname as pname, A.disname, A.leader, A.person_number, A.status, A.classify, A.create_by, A.create_time, A.update_by, A.update_time from busi_prison_line A + LEFT JOIN busi_prison_line B on A.pid = B.id +

订单信息

+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +

产品需求信息

+
+
+ + +
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/order/edit.html b/ruoyi-admin/src/main/resources/templates/busi/order/edit.html new file mode 100644 index 000000000..a305d61d0 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/busi/order/edit.html @@ -0,0 +1,184 @@ + + + + + + +
+
+

订单信息

+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +

产品需求信息

+
+
+ + +
+
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/order/order.html b/ruoyi-admin/src/main/resources/templates/busi/order/order.html new file mode 100644 index 000000000..7348b7c02 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/busi/order/order.html @@ -0,0 +1,153 @@ + + + + + + +
+
+
+
+
+
    +
  • + + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/prisonLine/prisonLine.html b/ruoyi-admin/src/main/resources/templates/busi/prisonLine/prisonLine.html index 9466b506d..d85e34718 100644 --- a/ruoyi-admin/src/main/resources/templates/busi/prisonLine/prisonLine.html +++ b/ruoyi-admin/src/main/resources/templates/busi/prisonLine/prisonLine.html @@ -20,7 +20,7 @@
  • - diff --git a/sql/busi_20211108.sql b/sql/busi_20211108.sql index f5f218232..0e9d115d7 100644 --- a/sql/busi_20211108.sql +++ b/sql/busi_20211108.sql @@ -3,6 +3,11 @@ insert into sys_dict_type values(12, '颜色', 'busi_color', '0', 'admin insert into sys_dict_type values(13, '客户角色', 'busi_role', '0', 'admin', sysdate(), '', null, '客户角色列表'); insert into sys_dict_type values(14, '产线状态', 'busi_line_status', '0', 'admin', sysdate(), '', null, '产线状态'); insert into sys_dict_type values(15, '类型', 'busi_line_type', '0', 'admin', sysdate(), '', null, '监区产线类型'); +insert into sys_dict_type values(16, '订单类型', 'busi_order_type', '0', 'admin', sysdate(), '', null, '订单类型'); +insert into sys_dict_type values(17, '订单状态', 'busi_order_status', '0', 'admin', sysdate(), '', null, '订单状态'); +insert into sys_dict_type values(18, '物料类型', 'busi_material_type', '0', 'admin', sysdate(), '', null, '物料类型'); +insert into sys_dict_type values(19, '物料单位', 'busi_material_unit', '0', 'admin', sysdate(), '', null, '物料单位'); + -- 尺码字典 insert into sys_dict_data values (30, 1, 'XXXXXS', '1', 'busi_size', '', '', 'N', '0', 'admin', sysdate(), '', null, ''); @@ -37,7 +42,7 @@ insert into sys_dict_data values (57, 13, '铁色', '13', 'busi_color', '', '', insert into sys_dict_data values (58, 14, '粉色', '14', 'busi_color', '', '', 'N', '0', 'admin', sysdate(), '', null, ''); -- 客户角色字典 -insert into sys_dict_data values (59, 1, '负责人', '1', 'busi_role', '', '', 'N', '0', 'admin', sysdate(), '', null, ''); +insert into sys_dict_data values (59, 1, '负责人', '1', 'busi_role', '', '', 'Y', '0', 'admin', sysdate(), '', null, ''); insert into sys_dict_data values (60, 2, '跟单人员', '2', 'busi_role', '', '', 'N', '0', 'admin', sysdate(), '', null, ''); -- 产线状态字典 @@ -48,6 +53,25 @@ insert into sys_dict_data values (62, 1, '生产中', '1', 'busi_line_status', ' insert into sys_dict_data values (63, 1, '监区', 'J', 'busi_line_type', '', '', 'N', '0', 'admin', sysdate(), '', null, ''); insert into sys_dict_data values (64, 2, '产线', 'C', 'busi_line_type', '', '', 'Y', '0', 'admin', sysdate(), '', null, ''); +-- 订单类型 +insert into sys_dict_data values (65, 1, '外套', '1', 'busi_order_type', '', '', 'Y', '0', 'admin', sysdate(), '', null, ''); +insert into sys_dict_data values (66, 2, '裤子', '2', 'busi_order_type', '', '', 'N', '0', 'admin', sysdate(), '', null, ''); + +-- 订单状态 +insert into sys_dict_data values (67, 1, '创建', '1', 'busi_order_status', '', '', 'Y', '0', 'admin', sysdate(), '', null, ''); +insert into sys_dict_data values (68, 2, '生产中', '2', 'busi_order_status', '', '', 'N', '0', 'admin', sysdate(), '', null, ''); +insert into sys_dict_data values (69, 3, '完成', '3', 'busi_order_status', '', '', 'N', '0', 'admin', sysdate(), '', null, ''); + +-- 物料类型 +insert into sys_dict_data values (70, 1, '布', '1', 'busi_material_type', '', '', 'Y', '0', 'admin', sysdate(), '', null, ''); +insert into sys_dict_data values (71, 2, '拉链', '2', 'busi_material_type', '', '', 'N', '0', 'admin', sysdate(), '', null, ''); + +-- 物料单位 +insert into sys_dict_data values (72, 1, '米', '1', 'busi_material_unit', '', '', 'Y', '0', 'admin', sysdate(), '', null, ''); +insert into sys_dict_data values (73, 2, '件', '2', 'busi_material_unit', '', '', 'N', '0', 'admin', sysdate(), '', null, ''); + + + -- 一级菜单 insert into sys_menu values ('117', '生产信息', '0', '1', '#', '', 'M', '0', '1', '', 'fa fa-wrench', 'admin', sysdate(), '', null, '生产信息菜单'); insert into sys_menu values ('118', '物料信息', '0', '2', '#', '', 'M', '0', '1', '', 'fa fa-cubes', 'admin', sysdate(), '', null, '物料信息菜单'); diff --git a/sql/tmp.sql b/sql/tmp.sql index 4c77a00f8..060fa6f9d 100644 --- a/sql/tmp.sql +++ b/sql/tmp.sql @@ -69,3 +69,28 @@ values('监区产线删除', @parentId, '4', '#', 'F', '0', 'busi:prisonLine:r insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) values('监区产线导出', @parentId, '5', '#', 'F', '0', 'busi:prisonLine:export', '#', 'admin', sysdate(), '', null, ''); + + + +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('订单维护', '119', '1', '/busi/order', 'C', '0', 'busi:order:view', '#', 'admin', sysdate(), '', null, '订单菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('订单查询', @parentId, '1', '#', 'F', '0', 'busi:order:list', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('订单新增', @parentId, '2', '#', 'F', '0', 'busi:order:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('订单修改', @parentId, '3', '#', 'F', '0', 'busi:order:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('订单删除', @parentId, '4', '#', 'F', '0', 'busi:order:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('订单导出', @parentId, '5', '#', 'F', '0', 'busi:order:export', '#', 'admin', sysdate(), '', null, '');