Browse Source
制程检验 新增制程检验添加页面 新增制程检验检查报告页面 新增制程检验修改页面 修改制程检验物料选择的字段信息 新增查找制程工序列表接口 CheckoutMaterialVO新增订单数量dev
11 changed files with 781 additions and 15 deletions
@ -0,0 +1,276 @@ |
|||
<!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-manufacturingCheckout-add"> |
|||
<div class="form-group"> |
|||
<label class="col-sm-4 control-label is-required">生产单号：</label> |
|||
<div class="col-sm-8"> |
|||
<select class="form-control" id="makeNo" name="makeNo" required> |
|||
<!-- 这里动态生成客户编号选项 --> |
|||
</select> |
|||
</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="checkoutTime" class="form-control" placeholder="yyyy-MM-dd" type="text"> |
|||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
</form> |
|||
|
|||
<div class="container"> |
|||
<div class="form-row"> |
|||
<div class="btn-group-sm" id="toolbar" role="group"> |
|||
<span>选择物料</span> |
|||
<a class="btn btn-success" onclick="insertRow()"> |
|||
<i class="fa fa-plus"></i> 选择物料 |
|||
</a> |
|||
</div> |
|||
</div> |
|||
<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 prefix = ctx + "quality/manufacturingCheckout" |
|||
$("#form-manufacturingCheckout-add").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
// 新增提交 |
|||
function submitHandler() { |
|||
// 获取表单数据 |
|||
const manufacturingCheckoutData = $("#form-manufacturingCheckout-add").serializeArray().reduce((obj, item) => { |
|||
obj[item.name] = item.value; |
|||
return obj; |
|||
}, {}); |
|||
// 获取bootstrap-table的数据，这里假设你使用bootstrap-table的API获取所有数据 |
|||
var table = $('#bootstrap-table').bootstrapTable('getData'); |
|||
|
|||
// 检查表格数据是否为空 |
|||
if (table.length===0){ |
|||
$.modal.alertWarning("请至少添加一条物料数据后再保存!"); |
|||
return; |
|||
} |
|||
console.log(table); |
|||
// 将表数据转换成与complaintNoticeData格式一致的数组 |
|||
var materialDataList = table.map(function(item) { |
|||
// 根据实际字段名调整 |
|||
return { |
|||
"materialNo": item.materialNo, // 假设id对应materialId |
|||
"materialPhotourl": item.materialPhotourl, // 假设quantity是物料数量字段 |
|||
"materialName": item.materialName, |
|||
"materialType": item.materialType, |
|||
"materialUnit": item.materialUnit, |
|||
"materialBrand": item.materialBrand, |
|||
"materialDescribe": item.materialDescribe, |
|||
"makeTotal": item.makeTotal, |
|||
"checkedNum": item.checkedNum, |
|||
"currentCheckoutNum": item.currentCheckoutNum, |
|||
"processQualifiedNum":item.processQualifiedNum, |
|||
"processUnqualifiedNum":item.processUnqualifiedNum |
|||
// ...其他字段 |
|||
}; |
|||
}); |
|||
|
|||
const combinedData = Object.assign({}, manufacturingCheckoutData, { checkoutMaterialList: materialDataList }); |
|||
// 合并表单数据和表格数据 |
|||
console.log(combinedData) |
|||
// 使用 JSON.stringify() 序列化数据 |
|||
const jsonData = JSON.stringify(combinedData); |
|||
// 发送 AJAX 请求到后端接口 |
|||
$.operate.saveJson(prefix + "/add", jsonData); |
|||
} |
|||
|
|||
$("input[name='checkoutTime']").datetimepicker({ |
|||
format: "yyyy-mm-dd", |
|||
minView: "month", |
|||
autoclose: true |
|||
}); |
|||
|
|||
/*加载所有的关联生产单号*/ |
|||
loadAllMakeNos(); |
|||
/*加载所有的关联生产单号*/ |
|||
function loadAllMakeNos(){ |
|||
var url = ctx + 'system/makeorder/getAllMakeNos'; |
|||
$.ajax({ |
|||
type:'GET',//请求类型 |
|||
url:url,//后端接口url |
|||
dataType:'json', //预期服务器返回数据类型 |
|||
success: function (data){ |
|||
if (data && Array.isArray(data)){ |
|||
var selectElement = $('#makeNo'); //获取生产编号下拉框元素 |
|||
//清空下拉框现有选项 |
|||
selectElement.empty(); |
|||
// 添加默认选项（如果需要） |
|||
selectElement.append('<option value="">请选择关联生产单号</option>'); |
|||
//遍历返回的数据,添加下拉框的选项 |
|||
$.each(data,function (index,item){ |
|||
//赋值遍历数据中的makeNo到下拉框中 |
|||
selectElement.append('<option value="'+item.makeNo+'">'+item.makeNo+'</option>'); |
|||
}) |
|||
}else { |
|||
$.modal.error("数据为空"); |
|||
} |
|||
} |
|||
}) |
|||
} |
|||
|
|||
//物料信息展示列表 |
|||
$(function() { |
|||
var options = { |
|||
modalName: "选择物料", |
|||
columns: [{ |
|||
checkbox: true |
|||
}, |
|||
{ |
|||
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: 'makeTotal', |
|||
}, |
|||
{ |
|||
title: '已检验数', |
|||
field: 'checkedNum', |
|||
}, |
|||
{ |
|||
title: '本次检验数', |
|||
field: 'currentCheckoutNum', |
|||
editable: { |
|||
type:'text' |
|||
} |
|||
}, |
|||
{ |
|||
title: '制程检验报告', |
|||
align: 'center', |
|||
formatter: function(value, row, index) { |
|||
var actions = []; |
|||
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="checkoutReport(\'' + row.materialNo + '\')"><i class="fa fa-plus"></i>检验报告</a> '); |
|||
return actions.join(''); |
|||
} |
|||
}, |
|||
{ |
|||
title: '工序合格数', |
|||
field: 'processQualifiedNum', |
|||
}, |
|||
{ |
|||
title: '工序不合格数', |
|||
field: 'processUnqualifiedNum', |
|||
}, |
|||
{ |
|||
title: '操作', |
|||
align: 'center', |
|||
formatter: function(value, row, index) { |
|||
var actions = []; |
|||
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(\'' + row.materialNo + '\')"><i class="fa fa-remove"></i>删除</a> '); |
|||
return actions.join(''); |
|||
} |
|||
} |
|||
] |
|||
}; |
|||
$.table.init(options); |
|||
}) |
|||
|
|||
/*选择物料按钮*/ |
|||
function insertRow() { |
|||
var selectedMakeNo = $("#makeNo").val(); |
|||
if (!selectedMakeNo) { |
|||
$.modal.alertWarning("请先选择生产单号。"); |
|||
return; |
|||
} |
|||
var encodedMakeNo = encodeURIComponent(selectedMakeNo); |
|||
var url = ctx + 'quality/manufacturingCheckout/materialSelect?makeNo=' + encodedMakeNo; |
|||
var options = { |
|||
title: '选择物料', |
|||
url: url, |
|||
callBack: doSubmit |
|||
}; |
|||
$.modal.openOptions(options); |
|||
} |
|||
|
|||
|
|||
function doSubmit(index, layero,uniqueId){ |
|||
console.log(uniqueId); |
|||
var iframeWin = window[layero.find('iframe')[0]['name']]; |
|||
var rowData = iframeWin.$('#bootstrap-materialSelect-table').bootstrapTable('getSelections')[0]; |
|||
console.log("rowData: "+rowData); |
|||
$("#bootstrap-table").bootstrapTable('insertRow', { |
|||
index:1, |
|||
row: { |
|||
materialNo:rowData.materialNo, |
|||
materialPhotourl:rowData.materialPhotourl, |
|||
materialName: rowData.materialName, |
|||
materialType: rowData.materialType, |
|||
materialDescribe: rowData.materialDescribe, |
|||
materialBrand: rowData.materialBrand, |
|||
materialUnit: rowData.materialUnit, |
|||
materialProcessMethod: rowData.materialProcessMethod, |
|||
makeTotal:rowData.makeTotal |
|||
} |
|||
}) |
|||
layer.close(index); |
|||
} |
|||
|
|||
// 逻辑删除前端的一行数据 |
|||
function removeRow(materialNo){ |
|||
$("#bootstrap-table").bootstrapTable('remove', { |
|||
field: 'materialNo', |
|||
values: materialNo |
|||
}) |
|||
} |
|||
|
|||
|
|||
/*检验报告*/ |
|||
function checkoutReport(materialNo){ |
|||
var makeNo = $('#makeNo').val(); //获取生产编号下拉框元素 |
|||
var url = ctx + 'quality/manufacturingCheckout/checkoutReport/' + materialNo+'/'+makeNo; |
|||
$.modal.open("制程检验报告",url); |
|||
} |
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -0,0 +1,229 @@ |
|||
<!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-checkoutMaterial-edit" th:object="${qualityManufacturingCheckoutMaterial}"> |
|||
<input name="manufacturingCheckoutMaterialId" th:field="*{manufacturingCheckoutMaterialId}" type="hidden"> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">料号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="materialNo" th:field="*{materialNo}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">物料名称：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="materialName" th:field="*{materialName}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">订单数：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="makeTotal" th:field="*{makeTotal}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">已检验数：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="checkedNum" th:field="*{checkedNum}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
|
|||
<!-- <div class="form-row">--> |
|||
<!-- <div class="container">--> |
|||
<!-- <div class="form-row">--> |
|||
<!-- <div class="btn-group-sm" id="toolbar" role="group">--> |
|||
<!-- <span>选择制程工序</span>--> |
|||
<!-- <a class="btn btn-success" onclick="addManufacturingProcess()">--> |
|||
<!-- <i class="fa fa-plus"></i> 添加制程工序--> |
|||
<!-- </a>--> |
|||
<!-- </div>--> |
|||
<!-- </div>--> |
|||
<!-- </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="checkoutCompletionTime" th:value="${#dates.format(qualityManufacturingCheckoutMaterial.checkoutCompletionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"> |
|||
<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">备注：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="remark" th:field="*{remark}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
</form> |
|||
|
|||
|
|||
|
|||
</div> |
|||
<th:block th:include="include :: footer" /> |
|||
<th:block th:include="include :: datetimepicker-js" /> |
|||
<script th:inline="javascript"> |
|||
var manufacturingProcessNameDatas = [[${@dict.getType('manufacturing_process_name')}]]; |
|||
var prefix = ctx + "quality/checkoutMaterial"; |
|||
$("#form-checkoutMaterial-edit").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
function submitHandler() { |
|||
if ($.validate.form()) { |
|||
$.operate.save(prefix + "/edit", $('#form-checkoutMaterial-edit').serialize()); |
|||
} |
|||
} |
|||
|
|||
$("input[name='checkoutTime']").datetimepicker({ |
|||
format: "yyyy-mm-dd", |
|||
minView: "month", |
|||
autoclose: true |
|||
}); |
|||
|
|||
$("input[name='checkoutCompletionTime']").datetimepicker({ |
|||
format: "yyyy-mm-dd", |
|||
minView: "month", |
|||
autoclose: true |
|||
}); |
|||
|
|||
|
|||
//制程工序展示列表 |
|||
$(function() { |
|||
var options = { |
|||
id:'bootstrap-manufacturingProcess-table', |
|||
modalName: "选择制程工序", |
|||
height:50, |
|||
columns: [{ |
|||
checkbox: true |
|||
}, |
|||
{ |
|||
title: '制程工序编号', |
|||
field: 'manufacturingProcessCode', |
|||
}, |
|||
{ |
|||
title: '制程工序名称', |
|||
field: 'manufacturingProcessName', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(manufacturingProcessNameDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
title: '设备名称', |
|||
field: 'deviceName', |
|||
}, |
|||
{ |
|||
title: '设备型号', |
|||
field: 'deviceModelCode', |
|||
}, |
|||
{ |
|||
title: '工序顺序', |
|||
field: 'processSequence', |
|||
}, |
|||
{ |
|||
title: '车间名称', |
|||
field: 'workshopName', |
|||
}, |
|||
{ |
|||
title: '零件名称', |
|||
field: 'modName', |
|||
}, |
|||
|
|||
{ |
|||
title: '操作', |
|||
align: 'center', |
|||
formatter: function(value, row, index) { |
|||
var actions = []; |
|||
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(\'' + row.manufacturingProcessCode + '\')"><i class="fa fa-remove"></i>删除</a> '); |
|||
return actions.join(''); |
|||
} |
|||
}, |
|||
] |
|||
}; |
|||
$.table.init(options); |
|||
}) |
|||
|
|||
|
|||
$(function() { |
|||
var options = { |
|||
id:'bootstrap-manufacturingProcess-table', |
|||
modalName: "选择制程工序", |
|||
height:50, |
|||
columns: [{ |
|||
checkbox: true |
|||
}, |
|||
{ |
|||
title: '制程工序编号', |
|||
field: 'manufacturingProcessCode', |
|||
}, |
|||
{ |
|||
title: '制程工序名称', |
|||
field: 'manufacturingProcessName', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(manufacturingProcessNameDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
title: '设备名称', |
|||
field: 'deviceName', |
|||
}, |
|||
{ |
|||
title: '设备型号', |
|||
field: 'deviceModelCode', |
|||
}, |
|||
|
|||
{ |
|||
title: '操作', |
|||
align: 'center', |
|||
formatter: function(value, row, index) { |
|||
var actions = []; |
|||
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(\'' + row.manufacturingProcessCode + '\')"><i class="fa fa-remove"></i>删除</a> '); |
|||
return actions.join(''); |
|||
} |
|||
} |
|||
] |
|||
}; |
|||
$.table.init(options); |
|||
}) |
|||
|
|||
/*添加制程工序按钮*/ |
|||
// function insertRow() { |
|||
// var url = ctx + 'quality/manufacturingCheckout/manufacturingProcessSelect'; |
|||
// var options = { |
|||
// title: '选制程工序', |
|||
// url: url, |
|||
// callBack: doSubmit |
|||
// }; |
|||
// $.modal.openOptions(options); |
|||
// } |
|||
// |
|||
// |
|||
// function doSubmit(index, layero,uniqueId){ |
|||
// console.log(uniqueId); |
|||
// var iframeWin = window[layero.find('iframe')[0]['name']]; |
|||
// var rowData = iframeWin.$('#bootstrap-manufacturingProcessSelect-table').bootstrapTable('getSelections')[0]; |
|||
// console.log("rowData: "+rowData); |
|||
// $("#bootstrap-manufacturingProcess-table").bootstrapTable('insertRow', { |
|||
// index:1, |
|||
// row: { |
|||
// manufacturingProcessCode:rowData.manufacturingProcessCode, |
|||
// manufacturingProcessName:rowData.manufacturingProcessName, |
|||
// deviceName: rowData.deviceName, |
|||
// deviceModelCode: rowData.deviceModelCode, |
|||
// processSequence: rowData.processSequence, |
|||
// workshopName: rowData.workshopName, |
|||
// modName: rowData.modName, |
|||
// } |
|||
// }) |
|||
// layer.close(index); |
|||
// } |
|||
|
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -0,0 +1,91 @@ |
|||
<!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-manufacturingCheckout-edit" th:object="${qualityManufacturingCheckout}"> |
|||
<input name="manufacturingCheckoutId" th:field="*{manufacturingCheckoutId}" type="hidden"> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">制程检验单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="manufacturingCheckoutCode" th:field="*{manufacturingCheckoutCode}" class="form-control" type="text"> |
|||
</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"> |
|||
</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="checkoutTime" th:value="${#dates.format(qualityManufacturingCheckout.checkoutTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"> |
|||
<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">料号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="materialNo" th:field="*{materialNo}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">物料名称：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="materialName" th:field="*{materialName}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">物料数合计：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="materialTotal" th:field="*{materialTotal}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">数量合计：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="numTotal" th:field="*{numTotal}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">制程工序合格数：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="processQualifiedNum" th:field="*{processQualifiedNum}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">制程工序不合格数：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="processUnqualifiedNum" th:field="*{processUnqualifiedNum}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
</form> |
|||
</div> |
|||
<th:block th:include="include :: footer" /> |
|||
<th:block th:include="include :: datetimepicker-js" /> |
|||
<script th:inline="javascript"> |
|||
var prefix = ctx + "quality/manufacturingCheckout"; |
|||
$("#form-manufacturingCheckout-edit").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
function submitHandler() { |
|||
if ($.validate.form()) { |
|||
$.operate.save(prefix + "/edit", $('#form-manufacturingCheckout-edit').serialize()); |
|||
} |
|||
} |
|||
|
|||
$("input[name='checkoutTime']").datetimepicker({ |
|||
format: "yyyy-mm-dd", |
|||
minView: "month", |
|||
autoclose: true |
|||
}); |
|||
</script> |
|||
</body> |
|||
</html> |
|||
Loading…
Reference in new issue