diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 1f967466..ae606d78 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/unis_pms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: sagacity + password: unis@db # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/add.html b/ruoyi-admin/src/main/resources/templates/manage/order/add.html index 7cb986b4..c635d66d 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/add.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/add.html @@ -170,11 +170,11 @@ } }, { - field: 'productId', + field: 'productCode', align: 'center', - title: '产品编码', + title: 'BOM编码', formatter: function(value, row, index) { - var html = $.common.sprintf("", index, value); + var html = $.common.sprintf("", index, value); return html; } }, @@ -214,33 +214,6 @@ return html; } }, - { - field: 'createdAt', - align: 'center', - title: '创建时间', - formatter: function(value, row, index) { - var html = $.common.sprintf("", index, value); - return html; - } - }, - { - field: 'updatedAt', - align: 'center', - title: '更新时间', - formatter: function(value, row, index) { - var html = $.common.sprintf("", index, value); - return html; - } - }, - { - field: 'deletedAt', - align: 'center', - title: '删除时间', - formatter: function(value, row, index) { - var html = $.common.sprintf("", index, value); - return html; - } - }, { title: '操作', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html index cd28b573..2b4a5d91 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html @@ -172,11 +172,11 @@ } }, { - field: 'productId', + field: 'productCode', align: 'center', - title: '产品编码', + title: 'BOM编码', formatter: function(value, row, index) { - var html = $.common.sprintf("", index, value); + var html = $.common.sprintf("", index, value); return html; } }, @@ -221,36 +221,6 @@ } }, - { - field: 'createdAt', - align: 'center', - title: '创建时间', - formatter: function(value, row, index) { - var html = $.common.sprintf("", index, value); - return html; - } - }, - - { - field: 'updatedAt', - align: 'center', - title: '更新时间', - formatter: function(value, row, index) { - var html = $.common.sprintf("", index, value); - return html; - } - }, - - { - field: 'deletedAt', - align: 'center', - title: '删除时间', - formatter: function(value, row, index) { - var html = $.common.sprintf("", index, value); - return html; - } - }, - { title: '操作', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/order.html b/ruoyi-admin/src/main/resources/templates/manage/order/order.html index 1fe2ab9f..3251cd91 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/order.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/order.html @@ -82,7 +82,7 @@ }, { field: 'orderCode', - title: '合同编号，唯一' + title: '合同编号' }, { field: 'versionCode', diff --git a/ruoyi-admin/src/main/resources/templates/system/product/add.html b/ruoyi-admin/src/main/resources/templates/system/product/add.html index ffd60041..5a0795c9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/product/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/product/add.html @@ -9,7 +9,7 @@
- +
@@ -25,7 +25,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/product/edit.html b/ruoyi-admin/src/main/resources/templates/system/product/edit.html index 36269754..7437e84e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/product/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/product/edit.html @@ -9,7 +9,7 @@
- +
@@ -25,7 +25,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/product/product.html b/ruoyi-admin/src/main/resources/templates/system/product/product.html index cc02df4c..bbf773cb 100644 --- a/ruoyi-admin/src/main/resources/templates/system/product/product.html +++ b/ruoyi-admin/src/main/resources/templates/system/product/product.html @@ -11,7 +11,7 @@
  • - +
  • @@ -19,7 +19,7 @@
  • - +
  • @@ -74,7 +74,7 @@ }, { field: 'productCode', - title: '产品编码' + title: 'BOM编码' }, { field: 'productName', @@ -82,7 +82,7 @@ }, { field: 'model', - title: '产品代码' + title: '产品型号' }, { field: 'description', diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java index 1f022a56..74cb4525 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java @@ -25,7 +25,7 @@ public class OrderInfo extends BaseEntity private String projectCode; /** 合同编号，唯一 */ - @Excel(name = "合同编号，唯一") + @Excel(name = "合同编号") private String orderCode; /** 版本号 */ diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderList.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderList.java index 9db2f958..a5123273 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderList.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderList.java @@ -27,7 +27,7 @@ public class OrderList extends BaseEntity /** 产品编码，关联产品编码表 */ @Excel(name = "产品编码，关联产品编码表") - private Long productId; + private String productCode; /** 数量 */ @Excel(name = "数量") @@ -53,7 +53,7 @@ public class OrderList extends BaseEntity /** 删除时间，软删除 */ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @Excel(name = "删除时间，软删除", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd") private Date deletedAt; public void setId(Long id) @@ -74,14 +74,14 @@ public class OrderList extends BaseEntity { return orderId; } - public void setProductId(Long productId) + public void setProductCode(String productCode) { - this.productId = productId; + this.productCode = productCode; } - public Long getProductId() + public String getProductCode() { - return productId; + return productCode; } public void setQuantity(Long quantity) { @@ -143,7 +143,7 @@ public class OrderList extends BaseEntity return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) .append("orderId", getOrderId()) - .append("productId", getProductId()) + .append("productCode", getProductCode()) .append("quantity", getQuantity()) .append("price", getPrice()) .append("amount", getAmount()) diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml index 787afc66..cc963880 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml @@ -32,14 +32,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - - @@ -64,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -152,9 +150,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into order_list( id, order_id, product_id, quantity, price, amount, remark, created_at, updated_at, deleted_at) values + insert into order_list( id, order_id, product_code, quantity, price, amount, remark, created_at, updated_at, deleted_at) values - ( #{item.id}, #{item.orderId}, #{item.productId}, #{item.quantity}, #{item.price}, #{item.amount}, #{item.remark}, #{item.createdAt}, #{item.updatedAt}, #{item.deletedAt}) + ( #{item.id}, #{item.orderId}, #{item.productCode}, #{item.quantity}, #{item.price}, #{item.amount}, #{item.remark}, #{item.createdAt}, #{item.updatedAt}, #{item.deletedAt})