ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

物料流水增加订单选择

This commit is contained in:
vitas 2021-12-24 22:38:34 +08:00
parent 0e7731f7b6
commit 0230110bae
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ruoyi-admin/src/main/resources/templates/busi/materialperate/add.html
View File

@ -8,12 +8,19 @@
<form class="form-horizontal m" id="form-materialperate-add">
<div class="form-group">
<label class="col-sm-3 control-label">订单：</label>
<div class="col-sm-8">
<input id="treeId" name="orderId" type="hidden">
<input id="treeName" name="orderName" readonly="true" onclick="selectOrder(1)" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料选择：</label>
<div class="col-sm-8">
<input name="materialStockId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">操作数量：</label>
<label class="col-sm-3 control-label is-required">数量：</label>
<div class="col-sm-8">
<input name="amount" class="form-control" type="text" required>
</div>
@ -23,8 +30,9 @@
<div class="col-sm-8">
<select name="oprateType" class="form-control m-b">
<option value="">所有</option>
<option value="1" selected>入库</option>
<option value="2">出库</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
@ -47,6 +55,23 @@
$.operate.save(prefix + "/add", $('#form-materialperate-add').serialize());
}
}
/*订单选择*/
function selectOrder(status) {
var options = {
title: '选择订单',
width: "380",
height: "400",
url: ctx + "busi/order/selectOrder/" + status,
callBack: function(index, layero){
var body = $.modal.getChildFrame(index);
$("#treeId").val(body.find('#treeId').val());
$("#treeName").val(body.find('#treeName').val());
$.modal.close(index);
}
};
$.modal.openOptions(options);
}
</script>
</body>
</html>

3
ruoyi-admin/src/main/resources/templates/busi/materialperate/materialperate.html
View File

@ -18,7 +18,8 @@
<label>操作类型：</label>
<select name="oprateType">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
<option value="1">入库</option>
<option value="2">出库</option>
</select>
</li>
<li>

8
sql/tmp.sql
View File

@ -145,3 +145,11 @@ values('物料操作流水删除', @parentId, '4', '#', 'F', '0', 'busi:materi
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:materialperate:export', '#', 'admin', sysdate(), '', null, '');
select max(A.classify),max(sdd.dict_label),max(sdd2.dict_label),max(A.color), sum(A.amount) from busi_material_require A
left join busi_product_require B on A.product_require_id = B.id
left join busi_order bo on B.order_id = bo.id
left join sys_dict_data sdd on sdd.dict_type='busi_color' and A.color = sdd.dict_value
left join sys_dict_data sdd2 on sdd2.dict_type='busi_material_type' and A.classify = sdd2.dict_value
where order_id = 1 group by (A.color + A.classify)