diff --git a/.DS_Store b/.DS_Store index d3a7b832..b026af94 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index a0e726bd..684c4da5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -16,7 +16,7 @@ public class RuoYiApplication { // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(RuoYiApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + + System.out.println("(♥◠‿◠)ﾉﾞ Application Start Completely ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + " | ( ' ) | \\ _. / ' \n" + diff --git a/ruoyi-admin/src/main/resources/.DS_Store b/ruoyi-admin/src/main/resources/.DS_Store index 0ec5eecf..f2e0fe80 100644 Binary files a/ruoyi-admin/src/main/resources/.DS_Store and b/ruoyi-admin/src/main/resources/.DS_Store differ diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index ae606d78..ba985d44 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://121.199.168.157: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&rewriteBatchedStatements=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: unis@db # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/static/.DS_Store b/ruoyi-admin/src/main/resources/static/.DS_Store new file mode 100644 index 00000000..4dc01d07 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/.DS_Store differ diff --git a/ruoyi-admin/src/main/resources/static/img/.DS_Store b/ruoyi-admin/src/main/resources/static/img/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/.DS_Store differ diff --git a/ruoyi-admin/src/main/resources/static/img/login-background.jpg b/ruoyi-admin/src/main/resources/static/img/login-background.jpg index adfa3f90..8dbafca1 100644 Binary files a/ruoyi-admin/src/main/resources/static/img/login-background.jpg and b/ruoyi-admin/src/main/resources/static/img/login-background.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/img/login-background_ruoyi.jpg b/ruoyi-admin/src/main/resources/static/img/login-background_ruoyi.jpg new file mode 100644 index 00000000..adfa3f90 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/login-background_ruoyi.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/img/profile.jpg b/ruoyi-admin/src/main/resources/static/img/profile.jpg index b3a940b2..951c9bd6 100644 Binary files a/ruoyi-admin/src/main/resources/static/img/profile.jpg and b/ruoyi-admin/src/main/resources/static/img/profile.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/img/profile_ruoyi.jpg b/ruoyi-admin/src/main/resources/static/img/profile_ruoyi.jpg new file mode 100644 index 00000000..b3a940b2 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/profile_ruoyi.jpg differ diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index 3a1fab2a..7cfa2154 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -3,8 +3,8 @@ - 登录若依系统 - + 登录应用管理系统 + @@ -26,10 +26,10 @@
-

[ 若依 ]

+

[ 紫光汇智 ]

-

欢迎使用 若依 后台管理系统

+

欢迎使用 紫光汇智 应用管理系统

合同清单列表

-
- - -
-
-
+
+
@@ -203,15 +199,17 @@ showColumns: false, sidePagination: "client", columns: [{ - checkbox: true + checkbox: false }, { field: 'index', align: 'center', title: "序号", formatter: function (value, row, index) { - var columnIndex = $.common.sprintf("", $.table.serialNumber(index)); - return columnIndex + $.table.serialNumber(index); + // var columnIndex = $.common.sprintf("", $.table.serialNumber(index)); + //var html = $.common.sprintf("", index, value); + var html = $.common.sprintf("", index, value); + return html+$.table.serialNumber(index); } }, { @@ -219,7 +217,16 @@ align: 'center', title: 'BOM编码', formatter: function(value, row, index) { - var html = $.common.sprintf("", index, value); + var html = $.common.sprintf("

%s

", value); + return html; + } + }, + { + field: 'productName', + align: 'center', + title: '产品名称', + formatter: function(value, row, index) { + var html = $.common.sprintf("

%s

", value); return html; } }, @@ -234,16 +241,6 @@ } }, - { - field: 'price', - align: 'center', - title: '单价', - formatter: function(value, row, index) { - var html = $.common.sprintf("", index, value); - return html; - } - }, - { field: 'amount', align: 'center', @@ -262,35 +259,10 @@ var html = $.common.sprintf("", index, value); return html; } - }, - - { - title: '操作', - align: 'center', - formatter: function(value, row, index) { - var value = $.common.isNotEmpty(row.index) ? row.index : $.table.serialNumber(index); - return '删除'; - } }] }; $.table.init(options); }); - - function addRow() { - var count = $("#" + table.options.id).bootstrapTable('getData').length; - var row = { - index: $.table.serialNumber(count), - productId: "", - quantity: "", - price: "", - amount: "", - remark: "", - createdAt: "", - updatedAt: "", - deletedAt: "", - } - sub.addRow(row); - } \ No newline at end of file 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 a36d145e..fbc91021 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 @@ -26,9 +26,12 @@ public class OrderList extends BaseEntity private Long orderId; /** 产品编码，关联产品编码表 */ - @Excel(name = "产品编码，关联产品编码表") + @Excel(name = "BOM编码") private String productCode; + @Excel(name = "产品名称") + private String productName; + /** 数量 */ @Excel(name = "数量") private Long quantity; @@ -42,7 +45,6 @@ public class OrderList extends BaseEntity private BigDecimal amount; - private String operateFlag; /** 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @@ -85,6 +87,10 @@ public class OrderList extends BaseEntity { return productCode; } + public String getProductName() + { + return productName; + } public void setQuantity(Long quantity) { this.quantity = quantity; @@ -140,13 +146,6 @@ public class OrderList extends BaseEntity return deletedAt; } - public String getOperateFlag() { - return operateFlag; - } - - public void setOperateFlag(String operateFlag) { - this.operateFlag = operateFlag; - } @Override public String toString() { @@ -154,6 +153,7 @@ public class OrderList extends BaseEntity .append("id", getId()) .append("orderId", getOrderId()) .append("productCode", getProductCode()) + .append("productName", getProductName()) .append("quantity", getQuantity()) .append("price", getPrice()) .append("amount", getAmount()) diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java index 1254649b..c32cab72 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java @@ -96,8 +96,12 @@ public class OrderInfoServiceImpl implements IOrderInfoService // // orderInfoMapper.logicRemoveListById(deleteList); // } - orderInfoMapper.deleteOrderListByOrderId(orderInfo.getId()); - insertOrderList(orderInfo); +// orderInfoMapper.deleteOrderListByOrderId(orderInfo.getId()); +// insertOrderList(orderInfo); + List orderListList = orderInfo.getOrderListList(); + if (orderListList!=null && !orderListList.isEmpty()){ + orderInfoMapper.updateListBatch(orderListList); + } return orderInfoMapper.updateOrderInfo(orderInfo); } diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml index 5bdf0416..a332c049 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml @@ -94,7 +94,7 @@ t1.status, t1.remark, t1.created_at, - t1. updated_at, + t1.updated_at, t1.deleted_at, t2.dept_name as order_dept_name, t3.dept_name as partner_dept_name @@ -105,19 +105,21 @@