From 4a44d460531ac017ac5bd006461ad40433acef7c Mon Sep 17 00:00:00 2001 From: wangcl Date: Wed, 29 Dec 2021 16:25:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=93=8D=E4=BD=9C=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/busi/domain/BusiProductRequire.java | 16 ++++---- .../mapper/busi/BusiMaterialOperateMapper.xml | 2 +- .../mapper/busi/BusiProductRequireMapper.xml | 4 +- .../main/resources/static/ruoyi/js/ry-ui.js | 11 +++-- .../templates/busi/materialperate/addIn.html | 20 ++++++++-- .../templates/busi/materialperate/addOut.html | 40 +++++++++++++------ 6 files changed, 62 insertions(+), 31 deletions(-) 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 index 5fe32edf3..bc437c9c4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProductRequire.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProductRequire.java @@ -30,7 +30,7 @@ public class BusiProductRequire extends BaseEntity /** 数量 */ @Excel(name = "数量") - private Long amount; + private double amount; /** 尺码 */ @Excel(name = "尺码") @@ -66,16 +66,16 @@ public class BusiProductRequire extends BaseEntity { return orderId; } - public void setAmount(Long amount) - { + + public double getAmount() { + return amount; + } + + public void setAmount(double amount) { this.amount = amount; } - public Long getAmount() - { - return amount; - } - public void setSize(String size) + public void setSize(String size) { this.size = size; } diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiMaterialOperateMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiMaterialOperateMapper.xml index 27442ce73..f5886ab4a 100644 --- a/ruoyi-admin/src/main/resources/mapper/busi/BusiMaterialOperateMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiMaterialOperateMapper.xml @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bo.id = #{orderId} and bmo.oprate_type = #{oprateType} and bmo.create_by = #{createBy} - and create_time between #{params.beginCreateTime} and #{params.endCreateTime} + and bmo.create_time between #{params.beginCreateTime} and #{params.endCreateTime} order by create_time DESC diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiProductRequireMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiProductRequireMapper.xml index 1f6620974..c0db9cf15 100644 --- a/ruoyi-admin/src/main/resources/mapper/busi/BusiProductRequireMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiProductRequireMapper.xml @@ -138,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where bpr.order_id = #{orderId} diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 1977ef390..15a9e289f 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -1217,7 +1217,7 @@ var table = { return url; }, // 保存信息 刷新表格 - save: function(url, data, callback) { + save: function(url, data, callback, successCallback) { var config = { url: url, type: "post", @@ -1231,7 +1231,7 @@ var table = { if (typeof callback == "function") { callback(result); } - $.operate.successCallback(result); + $.operate.successCallback(result, successCallback); } }; $.ajax(config) @@ -1310,7 +1310,7 @@ var table = { $.modal.closeLoading(); }, // 成功回调执行事件（父窗体静默更新） - successCallback: function(result) { + successCallback: function(result, callback) { if (result.code == web_status.SUCCESS) { var parent = activeWindow(); if($.common.isEmpty(parent.table)) { @@ -1324,8 +1324,11 @@ var table = { parent.$.modal.msgSuccess(result.msg); parent.$.treeTable.refresh(); } + if (typeof callback == "function") { + callback(); + } } else if (result.code == web_status.WARNING) { - $.modal.alertWarning(result.msg) + $.modal.alertWarning(result.msg); } else { $.modal.alertError(result.msg); } diff --git a/ruoyi-admin/src/main/resources/templates/busi/materialperate/addIn.html b/ruoyi-admin/src/main/resources/templates/busi/materialperate/addIn.html index 45cd53586..d831e6ba5 100644 --- a/ruoyi-admin/src/main/resources/templates/busi/materialperate/addIn.html +++ b/ruoyi-admin/src/main/resources/templates/busi/materialperate/addIn.html @@ -24,6 +24,8 @@
+ +
@@ -81,9 +83,18 @@ queryColorList(orderId, classify); }) + + + $("#color").change(function(){ + var unit = $("#color :selected").attr("unit"); + $("#unit").val(unit); + }) + function submitHandler() { if ($.validate.form()) { - $.operate.save(prefix + "/add", $('#form-materialperate-add').serialize()); + $.operate.save(prefix + "/add", $('#form-materialperate-add').serialize(), {}, function(){ + $.modal.alertSuccess("保存成功"); + }); } } @@ -94,7 +105,7 @@ width: "480", height: "500", url: ctx + "busi/order/selectOrder/" + status, - callBack: function(index, layero){ + callBack: function(index){ var body = $.modal.getChildFrame(index); $("#treeId").val(body.find('#treeId').val()); $("#treeName").val(body.find('#treeName').val()); @@ -131,8 +142,9 @@ $("#color").empty().append(""); for (var i = 0; i < data.length; i++) { var val = data[i].colorCode; - var text = $.table.getDictText(colorDatas, val);; - $("#color").append(""); + var text = $.table.getDictText(colorDatas, val); + var unit = data[i].unit; + $("#color").append(""); } }) } diff --git a/ruoyi-admin/src/main/resources/templates/busi/materialperate/addOut.html b/ruoyi-admin/src/main/resources/templates/busi/materialperate/addOut.html index 44eb38eb5..fe301aa9b 100644 --- a/ruoyi-admin/src/main/resources/templates/busi/materialperate/addOut.html +++ b/ruoyi-admin/src/main/resources/templates/busi/materialperate/addOut.html @@ -6,7 +6,7 @@
- +
@@ -33,11 +33,13 @@
- -
- + +
+ +
- + +
@@ -79,9 +81,26 @@ queryColorList($("#product").val(), $("#classify").val()); }) + $("#color").change(function(){ + $("#requireAmount").empty().append($("#color :selected").attr("amount")); + cacuTotal(); + }) + + $("#amountPiece").keyup(function(){ + cacuTotal(); + }); + + function cacuTotal(){ + var total = $("#amountPiece").val() * $("#requireAmount").text(); + $("#totalAmount").empty().append(total.toFixed(2)); + $("#amount").val(total.toFixed(2)); + } + function submitHandler() { if ($.validate.form()) { - $.operate.save(prefix + "/add", $('#form-materialperate-add').serialize()); + $.operate.save(prefix + "/add", $('#form-materialperate-add').serialize(), {}, function(){ + $.modal.alertSuccess("保存成功"); + }); } } @@ -92,7 +111,7 @@ width: "480", height: "500", url: ctx + "busi/order/selectOrder/" + status, - callBack: function(index, layero){ + callBack: function(index){ var body = $.modal.getChildFrame(index); $("#treeId").val(body.find('#treeId').val()); $("#treeName").val(body.find('#treeName').val()); @@ -144,15 +163,12 @@ $("#color").empty().append(""); for (var i = 0; i < data.length; i++) { var val = data[i].colorCode; + var amount = data[i].amount; var text = $.table.getDictText(colorDatas, val); - $("#color").append(""); + $("#color").append(""); } }) } - - $(function(){ - console.log(parent.document); - }) \ No newline at end of file