Browse Source

[feat]仓库管理:

出库单
新增销售-出库详情 按钮
新增销售-出库详情页面salesOutWarehouseDetail.html
新增销售-出库详情后端查询页面接口
新增销售-出库详情后端修改保存接口
dev
liuxiaoxu 5 months ago
parent
commit
fb44f30a28
  1. 27
      ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java
  2. 2
      ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html
  3. 303
      ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouseDetail.html
  4. 10
      ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html

27
ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java

@ -201,6 +201,31 @@ public class WarehouseOutOrderController extends BaseController
return toAjax(warehouseOutOrderService.updateSalesOutWarehouse(warehouseOutOrder));
}
/**
* 销售单-出库
*/
@GetMapping("/salesOutWarehouseDetail/{outOrderId}")
public String salesOutWarehouseDetail(@PathVariable("outOrderId") Long outOrderId, ModelMap mmap)
{
WarehouseOutOrder warehouseOutOrder = warehouseOutOrderService.selectWarehouseOutOrderById(outOrderId);
mmap.put("warehouseOutOrder", warehouseOutOrder);
return prefix + "/salesOutWarehouseDetail";
}
/**
* 修改保存销售单-出库
*/
@RequiresPermissions("warehouse:warehouseOutOrder:salesOutWarehouseDetail")
@Log(title = "仓库出库单", businessType = BusinessType.UPDATE)
@PostMapping("/salesOutWarehouseDetail")
@ResponseBody
public AjaxResult salesOutWarehouseDetailSave(@RequestBody WarehouseOutOrder warehouseOutOrder)
{
return toAjax(warehouseOutOrderService.updateSalesOutWarehouse(warehouseOutOrder));
}
/**
* 销售单-出库 物料信息关联设备信息
*/
@ -230,7 +255,7 @@ public class WarehouseOutOrderController extends BaseController
}
/**
* 修改保存出库-出库
* 修改保存生产-出库
*/
@RequiresPermissions("warehouse:warehouseOutOrder:makeOutWarehouse")
@Log(title = "仓库出库单", businessType = BusinessType.UPDATE)

2
ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改仓库出库单')" />
<th:block th:include="include :: header('销售单-出库')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">

303
ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouseDetail.html

@ -0,0 +1,303 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('销售单-出库详情')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-prepareMaterial-edit" th:object="${warehouseOutOrder}">
<input name="outOrderId" th:field="*{outOrderId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">出库单号:</label>
<div class="col-sm-8">
<input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">订单类型:</label>
<div class="col-sm-8">
<select name="warehouseOrderType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_order_type')}" disabled>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseOrderType}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">销售订单号:</label>
<div class="col-sm-8">
<input name="salesOrderCode" th:field="*{salesOrderCode}" class="form-control" type="text" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">申请人员:</label>
<div class="col-sm-8">
<input name="applyName" th:field="*{applyName}" class="form-control" type="text" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">生产单号:</label>
<div class="col-sm-8">
<input name="makeNo" th:field="*{makeNo}" class="form-control" type="text" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">送货日期:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="deliveryDate" th:value="${#dates.format(warehouseOutOrder.deliveryDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户ID:</label>
<div class="col-sm-8">
<input name="customerId" th:field="*{customerId}" class="form-control" type="text" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户名称:</label>
<div class="col-sm-8">
<input name="customerName" th:field="*{customerName}" class="form-control" type="text" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">收货联系人:</label>
<div class="col-sm-8">
<input name="deliveryName" th:field="*{deliveryName}" class="form-control" type="text" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">收货电话:</label>
<div class="col-sm-8">
<input name="deliveryNumber" th:field="*{deliveryNumber}" class="form-control" type="text" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">收货地址:</label>
<div class="col-sm-8">
<input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注:</label>
<div class="col-sm-8">
<input name="remark" th:field="*{remark}" class="form-control" type="text" disabled>
</div>
</div>
</form>
<!--物料信息-->
<div class="container">
<div class="row">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<!--用于可以修改列表字段的插件-->
<th:block th:include="include :: bootstrap-table-editable-js" />
<script th:inline="javascript">
var warehouseOutOrder = [[${warehouseOutOrder}]];
var prefix = ctx + "warehouse/warehouseOutOrder";
// $("input[name='deliveryDate']").datetimepicker({
// format: "yyyy-mm-dd HH:mm:ss",
// minView: "month",
// autoclose: true
// });
$("#form-prepareMaterial-edit").validate({
focusCleanup: true
});
// 新增提交
function submitHandler() {
// 获取表单数据
const warehouseOutOrderData = $("#form-prepareMaterial-edit").serializeArray().reduce((obj, item) => {
obj[item.name] = item.value;
return obj;
}, {});
// 获取bootstrap-table的数据,这里假设你使用bootstrap-table的API获取所有数据
var table = $('#bootstrap-table').bootstrapTable('getData');
// 将表数据转换成与complaintNoticeData格式一致的数组
var materialDataList = table.map(function(item) {
// 根据实际字段名调整
return {
"outOrderDetailId":item.outOrderDetailId,
"outOrderCode":item.outOrderCode,
"materialNo": item.materialNo, // 假设id对应materialId
"prepareOutOrderSum":item.prepareOutOrderSum,
"actualOutOrderSum":item.actualOutOrderSum
// ...其他字段
};
});
const combinedData = Object.assign({}, warehouseOutOrderData, {
warehouseOutOrderDetailList: materialDataList,
});
// 合并表单数据和表格数据
console.log(combinedData)
// 使用 JSON.stringify() 序列化数据
const jsonData = JSON.stringify(combinedData);
// 发送 AJAX 请求到后端接口
$.operate.saveJson(prefix + "/salesOutWarehouse", jsonData);
}
//物料信息展示列表
$(function() {
var options = {
modalName: "选择物料",
url: ctx + "warehouse/warehouseOutOrder/getMaterialListByOutOrderCode",
queryParams: queryParams,
showSearch: false,
showRefresh: false,
showToggle: false,
showColumns: false,
pagination: false, // 设置不分页
detailView: true,
//指定父id列
onExpandRow : function(index, row, $detail) {
$detail.html('<table class="table-container" id="one_level_table_'+row.outOrderDetailId+'"></table>'
).find('table');
// 一阶
initOneLevelTable(index,row,$detail);
},
columns: [{
checkbox: true
},
{
title: '出库单详情ID',
field: 'outOrderDetailId',
visible: false
},
{
title: '销售单号',
field: 'salesOrderCode',
visible: false
},
{
title: '出库单号',
field: 'outOrderCode',
visible: false
},
{
title: '料号',
field: 'materialNo',
},
{
title: '图片',
field: 'materialPhotourl',
},
{
title: '物料名称',
field: 'materialName',
},
{
title: '物料类型',
field: 'materialType',
},
{
title: '描述',
field: 'materialDescribe',
},
{
title: '品牌',
field: 'materialBrand',
},
{
title: '单位',
field: 'materialUnit',
},
{
title: '加工方式',
field: 'materialProcessMethod',
},
{
title: '订单数量',
field: 'makeNum',
},
{
title: '已出库数',
field: 'hasOutOrderSum',
},
{
title: '申请出库数',
field: 'applyOutOrderSum',
},
{
title: '准备出库数',
field: 'prepareOutOrderSum',
},
{
title: '实际出库数',
field: 'actualOutOrderSum',
}
]
};
$.table.init(options);
});
function queryParams(params) {
var curParams = {
// 传递参数查询参数
outOrderCode: warehouseOutOrder.outOrderCode
};
console.log(curParams);
return curParams;
}
initOneLevelTable = function(index, row, $detail) {
$("#"+"one_level_table_"+row.outOrderDetailId).bootstrapTable({
url: prefix + "/getShippingDeviceList",
method: 'post',
sidePagination: "server",
contentType: "application/x-www-form-urlencoded",
queryParams : {
salesOrderCode: row.salesOrderCode,
materialNo: row.materialNo,
},
columns: [
{
field: 'shippingDeviceId',
title: '设备ID',
},
{
field: 'deviceModelCode',
title: '设备型号',
},
{
field: 'snCode',
title: '设备SN',
},
{
field: 'aftersalesPhotoUrl',
title: '售后图片',
},
{
field: 'guaranteePeriod',
title: '保修期',
},
{
field: 'factoryDate',
title: '出厂日期',
}]
});
};
</script>
</body>
</html>

10
ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html

@ -77,6 +77,8 @@
var prepareMaterialDetailFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:prepareMaterialDetail')}]];
var salesOutWarehouseDetailFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:salesOutWarehouseDetail')}]];
var warehouseOutStatusDatas = [[${@dict.getType('warehouse_out_status')}]];
var warehouseOrderTypeDatas = [[${@dict.getType('warehouse_order_type')}]];
@ -187,6 +189,7 @@
/*销售单-出库*/
if (row.warehouseOutStatus == 4 && row.warehouseOrderType == 0 && row.warehouseOutType == 0){
actions.push('<a class="btn btn-success btn-xs ' + salesOutWarehouseFlag + '" href="javascript:void(0)" onclick="salesOutWarehouse(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>出库</a> ');
actions.push('<a class="btn btn-success btn-xs ' + salesOutWarehouseDetailFlag + '" href="javascript:void(0)" onclick="salesOutWarehouseDetail(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>详情</a> ');
}
/*生产单-出库*/
if (row.warehouseOutStatus == 4 && row.warehouseOrderType == 1 && row.warehouseOutType == 1){
@ -226,6 +229,13 @@
$.modal.open("出库",url);
}
/*销售单-出库详情*/
function salesOutWarehouseDetail(outOrderId){
var url = ctx + 'warehouse/warehouseOutOrder/salesOutWarehouseDetail/' + outOrderId;
$.modal.open("出库详情",url);
}
/*生产单-出库*/
function makeOutWarehouse(outOrderId){
var url = ctx + 'warehouse/warehouseOutOrder/makeOutWarehouse/' + outOrderId;

Loading…
Cancel
Save