ERP_override.git

			@@ -320,6 +320,9 @@
			{title: t('basicData.operate'), width: 55, slots: {default: 'button_slot'}, fixed: "left"},
			{type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
			{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
			{field: 'printQuantity', title: t('processCard.printQuantity'), width: 90,
			editRender: {name: 'input', attrs: {placeholder: ''}},
			},
			{
			field: 'order_id',
			title: t('order.orderId'),
			@@ -388,9 +391,7 @@
			filterMethod: filterChanged, width: 100
			},
			{field: 'quantity', title: t('order.quantity'), width: 90},
			{field: 'printQuantity', title: t('processCard.printQuantity'), width: 90,
			editRender: {name: 'input', attrs: {placeholder: ''}},
			},

			{field: 'total_area', title: t('order.area'), width: 90},
			{
			field: 'product_name', title: t('order.product'), width: 120,

			@@ -330,6 +330,7 @@
			String processSub = flowCard.getProcess().split("->")[0];
			//获取工序对应的别称
			String processName = flowCardMapper.getProcessName(processSub);
			//processName.equals("stepC") \|\| processName.equals("stepD")
			if (processName.equals("stepC") \|\| processName.equals("stepD")) {//工艺是否包含夹胶中空
			itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(),
			String.valueOf("null".equals(compound)

			@@ -72,7 +72,7 @@
			.eq("glass_sort",dto1.getTechnologyNumber())
			);
			dto1.setGlassName(productDetail.getDetail());

			//basicData.getNickname().equals("stepC")
			}else if(basicData.getNickname().equals("stepC")){
			OrderGlassDetail orderGlassDetailGroup = orderGlassDetailMapper
			.selectOne(new QueryWrapper<OrderGlassDetail>()
			@@ -155,10 +155,12 @@
			.last("limit 1")
			);
			//判断磨边和磨边后工序
			//Objects.equals(basicData.getNickname(), "stepA") \|\| Objects.equals(basicData.getNickname(), "stepC")
			if(Objects.equals(basicData.getNickname(), "stepA") \|\| Objects.equals(basicData.getNickname(), "stepC")){
			clos.put(uniqueList.get(i).get("process"), 15+i);
			}
			//判断中空和中空后工序
			//Objects.equals(basicData.getNickname(), "stepB") \|\| Objects.equals(basicData.getNickname(), "stepD")
			if(Objects.equals(basicData.getNickname(), "stepB") \|\| Objects.equals(basicData.getNickname(), "stepD")){
			columns.add(15+i);
			}

	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史