|
|
|
@ -3,6 +3,7 @@ |
|
|
|
<head> |
|
|
|
<th:block th:include="include :: header('入库-采购单(仓库入库)')" /> |
|
|
|
<th:block th:include="include :: datetimepicker-css" /> |
|
|
|
<th:block th:include="include :: bootstrap-editable-css" /> |
|
|
|
<style> |
|
|
|
|
|
|
|
.supplier-value span { |
|
|
|
@ -13,7 +14,7 @@ |
|
|
|
</head> |
|
|
|
<body class="white-bg"> |
|
|
|
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
|
|
|
<form class="form-horizontal m" id="form-temporaryPurchaseWarehouse-edit" th:object="${warehouseStorageOrder}"> |
|
|
|
<form class="form-horizontal m" id="form-storagePurchaseWarehouse-edit" th:object="${warehouseStorageOrder}"> |
|
|
|
<input name="warehouseStorageId" th:field="*{warehouseStorageId}" type="hidden"> |
|
|
|
<div class="form-group"> |
|
|
|
<label class="col-sm-4 control-label">入库单号：</label> |
|
|
|
@ -35,6 +36,38 @@ |
|
|
|
</select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="form-group"> |
|
|
|
<label class="col-sm-4 control-label">供应商ID：</label> |
|
|
|
<div class="col-sm-8"> |
|
|
|
<input name="supplierCode" th:field="*{supplierCode}" class="form-control" type="text" readonly> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="form-group"> |
|
|
|
<label class="col-sm-4 control-label">供应商名称：</label> |
|
|
|
<div class="col-sm-8"> |
|
|
|
<input name="supplierName" th:field="*{supplierName}" class="form-control" type="text" readonly> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="form-group"> |
|
|
|
<label class="col-sm-4 control-label">联系人：</label> |
|
|
|
<div class="col-sm-8"> |
|
|
|
<input name="customerContact" th:field="*{customerContact}" class="form-control" type="text" readonly> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="form-group"> |
|
|
|
<label class="col-sm-4 control-label">联系人电话：</label> |
|
|
|
<div class="col-sm-8"> |
|
|
|
<input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" readonly> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="form-group"> |
|
|
|
<label class="col-sm-4 control-label">联系人地址：</label> |
|
|
|
<div class="col-sm-8"> |
|
|
|
<input name="supplierAddress" th:field="*{supplierAddress}" class="form-control" type="text" readonly> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="form-group"> |
|
|
|
<label class="col-sm-4 control-label">到货时间：</label> |
|
|
|
<div class="col-sm-8"> |
|
|
|
@ -74,11 +107,11 @@ |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<!--物料信息--> |
|
|
|
<div class="container"> |
|
|
|
<!--供应商物料相关--> |
|
|
|
<div class="row"> |
|
|
|
<div class="col-sm-12" id="tablesContainer"> |
|
|
|
<!-- 表格将在这里动态生成 --> |
|
|
|
<div class="col-sm-12 select-table table-striped"> |
|
|
|
<table id="bootstrap-table"></table> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -92,67 +125,62 @@ |
|
|
|
var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] |
|
|
|
var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] |
|
|
|
var prefix = ctx + "warehouse/storageOrder"; |
|
|
|
$("#form-temporaryPurchaseWarehouse-edit").validate({ |
|
|
|
$("#form-storagePurchaseWarehouse-edit").validate({ |
|
|
|
focusCleanup: true |
|
|
|
}); |
|
|
|
|
|
|
|
//生成的不同table的id集合 |
|
|
|
var tableDatas = []; |
|
|
|
|
|
|
|
function submitHandler() { |
|
|
|
const storageOrderData = $("#form-temporaryPurchaseWarehouse-edit").serializeArray().reduce((obj, item) => { |
|
|
|
obj[item.name] = item.value; |
|
|
|
return obj; |
|
|
|
}, {}); |
|
|
|
// 初始化一个数组用于存放所有表格的数据 |
|
|
|
let allMaterialDataList = []; |
|
|
|
for(let i in tableDatas){ |
|
|
|
$('#' + tableDatas[i]).each(function() { |
|
|
|
const tableData = $(this).bootstrapTable('getData'); |
|
|
|
console.log(JSON.stringify(tableData)); |
|
|
|
// 将表数据转换成与qualityReportData格式一致的数组 |
|
|
|
var materialDataList = tableData.map(function (item) { |
|
|
|
// 根据实际字段名调整 |
|
|
|
return { |
|
|
|
"warehouseStorageDetailId":item.warehouseStorageDetailId, |
|
|
|
"supplierCode": item.supplierCode, |
|
|
|
"materialNo": item.materialNo, |
|
|
|
"materialName": item.materialName, |
|
|
|
"materialType": item.materialType, |
|
|
|
"materialPhotourl": item.materialPhotourl, |
|
|
|
"materialDescribe": item.materialDescribe, |
|
|
|
"materialBrand": item.materialBrand, |
|
|
|
"materialUnit": item.materialUnit, |
|
|
|
"materialProcessMethod": item.materialProcessMethod, |
|
|
|
"notifyHasArrivedNum": item.notifyHasArrivedNum, |
|
|
|
"actualHasArrivedNum": item.actualHasArrivedNum, |
|
|
|
"temporaryHasQualifiedNum": item.temporaryHasQualifiedNum, |
|
|
|
"qualityHasQualifiedNum": item.qualityHasQualifiedNum, |
|
|
|
"hasStorageNum": item.hasStorageNum, |
|
|
|
"notifyArriveNum": item.notifyArriveNum, |
|
|
|
"actualArriveNum": item.actualArriveNum, |
|
|
|
"temporaryQualifiedNum": item.temporaryQualifiedNum, |
|
|
|
"temporaryRemark": item.temporaryRemark, |
|
|
|
"temporaryReportUrl": item.temporaryReportUrl, |
|
|
|
"storageNum": item.storageNum, |
|
|
|
"storageLocation": item.storageLocation, |
|
|
|
// ...其他字段 |
|
|
|
}; |
|
|
|
}); |
|
|
|
allMaterialDataList = allMaterialDataList.concat(materialDataList); |
|
|
|
if ($.validate.form()) { |
|
|
|
|
|
|
|
|
|
|
|
const storageOrderData = $("#form-storagePurchaseWarehouse-edit").serializeArray().reduce((obj, item) => { |
|
|
|
obj[item.name] = item.value; |
|
|
|
return obj; |
|
|
|
}, {}); |
|
|
|
|
|
|
|
|
|
|
|
var table = $('#bootstrap-table').bootstrapTable("getData"); |
|
|
|
|
|
|
|
var materialDataList = table.map(function(item) { |
|
|
|
// 根据实际字段名调整 |
|
|
|
return { |
|
|
|
"warehouseStorageDetailId":item.warehouseStorageDetailId, |
|
|
|
"supplierCode": item.supplierCode, |
|
|
|
"materialNo": item.materialNo, |
|
|
|
"materialName": item.materialName, |
|
|
|
"materialType": item.materialType, |
|
|
|
"materialPhotourl": item.materialPhotourl, |
|
|
|
"materialDescribe": item.materialDescribe, |
|
|
|
"materialModel": item.materialModel, |
|
|
|
"materialBrand": item.materialBrand, |
|
|
|
"materialUnit": item.materialUnit, |
|
|
|
"materialProcessMethod": item.materialProcessMethod, |
|
|
|
"notifyHasArrivedNum": item.notifyHasArrivedNum, |
|
|
|
"actualHasArrivedNum": item.actualHasArrivedNum, |
|
|
|
"temporaryHasQualifiedNum": item.temporaryHasQualifiedNum, |
|
|
|
"hasStorageNum": item.hasStorageNum, |
|
|
|
"notifyArriveNum": item.notifyArriveNum, |
|
|
|
"actualArriveNum": item.actualArriveNum, |
|
|
|
"temporaryQualifiedNum": item.temporaryQualifiedNum, |
|
|
|
"temporaryRemark": item.temporaryRemark, |
|
|
|
"temporaryReportUrl": item.temporaryReportUrl, |
|
|
|
"storageNum": item.storageNum, |
|
|
|
"storageLocation": item.storageLocation, |
|
|
|
// ...其他字段 |
|
|
|
}; |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
const combinedData = Object.assign({}, storageOrderData, { |
|
|
|
warehouseStorageOrderDetailList: allMaterialDataList |
|
|
|
}); |
|
|
|
// 合并表单数据和表格数据 |
|
|
|
// const combinedData = Object.assign({}, ...complaintNoticeData.array(item => ({ [item.name]: item.value })), ...materialData); |
|
|
|
console.log(combinedData) |
|
|
|
// 使用 JSON.stringify() 序列化数据 |
|
|
|
const jsonData = JSON.stringify(combinedData); |
|
|
|
// 发送 AJAX 请求到后端接口 |
|
|
|
$.operate.saveJson(prefix + "/storagePurchaseWarehouse", jsonData); |
|
|
|
const combinedData = Object.assign({}, storageOrderData, { |
|
|
|
warehouseStorageOrderDetailList: materialDataList, |
|
|
|
}); |
|
|
|
// 合并表单数据和表格数据 |
|
|
|
console.log(combinedData) |
|
|
|
// 使用 JSON.stringify() 序列化数据 |
|
|
|
const jsonData = JSON.stringify(combinedData); |
|
|
|
// 发送 AJAX 请求到后端接口 |
|
|
|
$.operate.saveJson(prefix + "/storagePurchase", jsonData); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
$("input[name='arrivedTime']").datetimepicker({ |
|
|
|
@ -167,41 +195,26 @@ |
|
|
|
autoclose: true |
|
|
|
}); |
|
|
|
|
|
|
|
//物料信息展示列表 |
|
|
|
$(function() { |
|
|
|
// 假设qualityOrderCode已经定义或者可以通过某种方式获取到 |
|
|
|
var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]; // 这里需要实际赋值，比如从前端某个地方读取 |
|
|
|
|
|
|
|
$.getJSON(prefix + "/storagePurchaseWarehouseDetailList?warehouseStorageCode=" + warehouseStorageCode, function(data) { |
|
|
|
for (var supplierCode in data) { |
|
|
|
if (data.hasOwnProperty(supplierCode)) { |
|
|
|
var supplierData = data[supplierCode]; |
|
|
|
createTableForSupplier(supplierCode, supplierData); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
function createTableForSupplier(supplierCode, supplierData) { |
|
|
|
var tableId = 'bootstrap-table-' + supplierCode.replace(/[^a-z0-9]/gi, '_').toLowerCase(); |
|
|
|
tableDatas.push(tableId); |
|
|
|
var $tableWrapper = $('<div class="table-responsive mt-3"></div>'); |
|
|
|
|
|
|
|
// 确保supplierData至少有一条记录，并从中提取供应商详细信息 |
|
|
|
var supplierInfo = supplierData.length > 0 ? supplierData[0] : {}; // 默认为空对象，以防数据不存在 |
|
|
|
|
|
|
|
// 构建含有额外供应商信息的标题字符串 |
|
|
|
var headerTitle ='供应商'+'</br>'+supplierCode + ' - ' + (supplierInfo.supplierName || 'N/A') + |
|
|
|
' </br> ' + (supplierInfo.customerContact || 'N/A') + |
|
|
|
' - ' + (supplierInfo.contactNumber || 'N/A') + |
|
|
|
' - ' + (supplierInfo.supplierAddress || 'N/A'); |
|
|
|
|
|
|
|
var $header = $('<h4>' + headerTitle + '</h4>'); |
|
|
|
var $table = $('<table id="' + tableId + '" class="table table-striped table-bordered"></table>'); |
|
|
|
|
|
|
|
$table.bootstrapTable({ |
|
|
|
data: supplierData, |
|
|
|
var options = { |
|
|
|
modalName: "选择物料", |
|
|
|
url: prefix + "/storagePurchaseWarehouseDetailList", |
|
|
|
queryParams: queryParams, |
|
|
|
showSearch: false, |
|
|
|
showRefresh: false, |
|
|
|
showToggle: false, |
|
|
|
showColumns: false, |
|
|
|
pagination: false, // 设置不分页 |
|
|
|
columns: [{ |
|
|
|
checkbox: true |
|
|
|
}, |
|
|
|
{ |
|
|
|
title: '入库单详情ID', |
|
|
|
field: 'warehouseStorageDetailId', |
|
|
|
visible: false |
|
|
|
|
|
|
|
}, |
|
|
|
{ |
|
|
|
title: '供应商ID', |
|
|
|
field: 'supplierCode', |
|
|
|
@ -226,10 +239,15 @@ |
|
|
|
title: '物料描述', |
|
|
|
field: 'materialDescribe', |
|
|
|
}, |
|
|
|
{ |
|
|
|
title: '物料型号', |
|
|
|
field: 'materialModel', |
|
|
|
}, |
|
|
|
{ |
|
|
|
title: '物料品牌', |
|
|
|
field: 'materialBrand', |
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
title: '物料单位', |
|
|
|
field: 'materialUnit', |
|
|
|
@ -250,11 +268,6 @@ |
|
|
|
{ |
|
|
|
title: '暂收已合格数', |
|
|
|
field: 'temporaryHasQualifiedNum', |
|
|
|
visible: false, |
|
|
|
}, |
|
|
|
{ |
|
|
|
title: '品质已合格数', |
|
|
|
field: 'qualityHasQualifiedNum', |
|
|
|
}, |
|
|
|
{ |
|
|
|
title: '已入库数', |
|
|
|
@ -267,12 +280,12 @@ |
|
|
|
|
|
|
|
{ |
|
|
|
title: '实际到货数', |
|
|
|
field: 'actualArriveNum', |
|
|
|
field: 'actualArriveNum' |
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
title: '暂收数量', |
|
|
|
field: 'temporaryQualifiedNum', |
|
|
|
field: 'temporaryQualifiedNum' |
|
|
|
}, |
|
|
|
{ |
|
|
|
title: '暂收备注', |
|
|
|
@ -287,26 +300,78 @@ |
|
|
|
{ |
|
|
|
title: '入库数', |
|
|
|
field: 'storageNum', |
|
|
|
editable:{ |
|
|
|
type: 'text', |
|
|
|
mode:'inline', |
|
|
|
validate: function (v) { |
|
|
|
if (!v) return '数量不能为空'; |
|
|
|
if (isNaN(v)) return '数量必须是数字'; |
|
|
|
var processBadNum = parseInt(v); |
|
|
|
if (processBadNum <= 0) return '数量必须是正整数'; |
|
|
|
editable: { |
|
|
|
validate: function(value) { |
|
|
|
if ($.trim(value) === '') { |
|
|
|
return '入库数不能为空'; |
|
|
|
} |
|
|
|
if (isNaN(value)) { |
|
|
|
return '请输入有效的数字'; |
|
|
|
} |
|
|
|
if (value < 0) { |
|
|
|
return '入库数不能小于0'; |
|
|
|
} |
|
|
|
//不能为小数 |
|
|
|
if (value % 1 !== 0) { |
|
|
|
return '入库数不能为小数'; |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
formatter: function (value, row) { |
|
|
|
// 检查 row 是否存在 |
|
|
|
if (!row) { |
|
|
|
return ""; |
|
|
|
} |
|
|
|
|
|
|
|
// 检查 storageNum 是否存在 |
|
|
|
if (row.storageNum === undefined || row.storageNum === null) { |
|
|
|
return ""; |
|
|
|
} |
|
|
|
|
|
|
|
// 根据 storageNum 的值决定返回值 |
|
|
|
if (row.storageNum) { |
|
|
|
return row.storageNum; |
|
|
|
} else { |
|
|
|
return value; |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
{ |
|
|
|
title: '存放位置', |
|
|
|
field: 'storageLocation', |
|
|
|
editable: true |
|
|
|
}] |
|
|
|
}); |
|
|
|
editable: { |
|
|
|
type: 'text', |
|
|
|
mode:'inline', |
|
|
|
}, |
|
|
|
formatter: function (value, row) { |
|
|
|
// 检查 row 是否存在 |
|
|
|
if (!row) { |
|
|
|
return ""; |
|
|
|
} |
|
|
|
|
|
|
|
// 检查 storageLocation 是否存在 |
|
|
|
if (row.storageLocation === undefined || row.storageLocation === null) { |
|
|
|
return ""; |
|
|
|
} |
|
|
|
|
|
|
|
// 根据 storageLocation 的值决定返回值 |
|
|
|
if (row.storageLocation) { |
|
|
|
return row.storageLocation; |
|
|
|
} else { |
|
|
|
return value; |
|
|
|
} |
|
|
|
} |
|
|
|
},] |
|
|
|
}; |
|
|
|
$.table.init(options); |
|
|
|
}) |
|
|
|
|
|
|
|
$tableWrapper.append($header).append($table); |
|
|
|
$('#tablesContainer').append($tableWrapper); |
|
|
|
function queryParams(params) { |
|
|
|
var curParams = { |
|
|
|
// 传递参数查询参数 |
|
|
|
warehouseStorageCode: warehouseStorageCode |
|
|
|
}; |
|
|
|
return curParams; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
