ERP_override.git

			@@ -145,6 +145,24 @@
			filterConfig: { //筛选配置项
			//remote: true
			},
			formConfig: {
			data: {
			shelfThickness: '',
			spacerThickness: '',
			inWeight: '',
			inMaxQuantity: '',
			inWidth:'',
			inHeight:''
			},
			items:[
			{ field: 'shelfThickness', title: '架子纵深', itemRender: { name: 'VxeInput' } },
			{ field: 'inWeight', title: '架子承重', itemRender: { name: 'VxeInput' } },
			{ field: 'inMaxQuantity', title: '最大数量', itemRender: { name: 'VxeInput' } },
			{ field: 'spacerThickness', title: '间隔厚度', itemRender: { name: 'VxeInput' } },
			{ field: 'inHeight', title: '最大长度', itemRender: { name: 'VxeInput' } },
			{ field: 'inWidth', title: '最短长度', itemRender: { name: 'VxeInput' } },
			]
			},
			customConfig: {
			storage: true
			},
			@@ -244,7 +262,6 @@
			})
			return parseFloat(count.toFixed(2))
			}

			return ''
			})
			]

			@@ -675,13 +675,38 @@
			JSONObject reportingWorkJson = new JSONObject(reportingWorkMap);
			ReportingWork reportingWork = JSONObject.parseObject(JSONObject.toJSONString(reportingWorkJson.get("title")), ReportingWork.class);
			ReportingWorkDetail reportingWorkDetail =JSON.parseObject(JSONObject.toJSONString(reportingWorkJson.get("detail")), ReportingWorkDetail.class);

			//查询流程卡工艺流程
			String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(reportingWork.getProcessId(), reportingWorkDetail.getTechnologyNumber());

			int index = technologicalProcess.indexOf("-");
			String interceptProcess = "";
			if (index <0){
			interceptProcess = technologicalProcess;
			}
			else {
			//获取工艺流程第一个工序
			interceptProcess = technologicalProcess.substring(0, index);
			}
			int processNum =0;
			if (interceptProcess.equals(reportingWork.getThisProcess())) {
			processNum = reportingWorkMapper.selectFlowCardNum(
			reportingWorkDetail.getOrderNumber(),
			reportingWorkDetail.getTechnologyNumber(),
			reportingWork.getProcessId(),
			reportingWork.getThisProcess()
			);
			}else{
			processNum = reportingWorkMapper.selectGlassProcessNum(
			reportingWorkDetail.getOrderNumber(),
			reportingWorkDetail.getTechnologyNumber(),
			reportingWork.getProcessId(),
			reportingWork.getThisProcess()
			);
			}

			//获取可报数量
			int processNum = reportingWorkMapper.selectGlassProcessNum(
			reportingWorkDetail.getOrderNumber(),
			reportingWorkDetail.getTechnologyNumber(),
			reportingWork.getProcessId(),
			reportingWork.getThisProcess()
			);

			//判断是否大于当前数量并且抛出异常
			if (processNum < (reportingWorkDetail.getBreakageQuantity() + reportingWorkDetail.getCompletedQuantity())) {
			return false;

			@@ -349,7 +349,7 @@
			0,
			(d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)
			),0)
			from flow_card as a
			from pp.flow_card as a
			left join sd.order_process_detail as b
			on
			b.order_number = a.order_number
			@@ -364,9 +364,9 @@
			rw.process_id,rw.order_sort,rw.technology_number,
			rwk.this_process
			from
			rework as rw
			pp.rework as rw
			LEFT JOIN
			reporting_work as rwk
			pp.reporting_work as rwk
			on rw.reporting_work_id =rwk.reporting_work_id
			where rwk.this_process=#{thisProcess}
			and rw.review_status=1

	north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java	37 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史