product-inventory-management-after.git

			@@ -193,14 +193,13 @@
			qualityInspect.setProductName(product.getProductName());
			qualityInspect.setModel(productModel.getModel());
			qualityInspect.setUnit(productModel.getUnit());
			qualityInspect.setQuantity(productQty);
			qualityInspect.setQuantity(productionProductOutput.getQuantity().subtract(productionProductOutput.getScrapQty()));
			qualityInspect.setProcess(process);
			qualityInspect.setInspectState(0);
			qualityInspect.setInspectType(inspectType);
			qualityInspect.setProductMainId(productionProductMain.getId());
			qualityInspect.setProductModelId(productModel.getId());
			qualityInspect.setBatchNo(productOrder.getBatchNo());
			qualityInspect.setInspectedQuantity(dto.getInspectedQuantity());
			qualityInspect.setManufacturingTeam(productOrder.getManufacturingTeam());
			qualityInspectMapper.insert(qualityInspect);
			List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(product.getId(), inspectType, process);
			@@ -219,7 +218,7 @@
			}
			}else {
			//直接入库
			stockUtils.addStock(productProcessRouteItem.getProductModelId(), productQty, StockInQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_IN.getCode(), productionProductMain.getId());
			stockUtils.addStock(productProcessRouteItem.getProductModelId(), productionProductOutput.getQuantity().subtract(productionProductOutput.getScrapQty()), StockInQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_IN.getCode(), productionProductMain.getId());
			}
			/更新工单和生产订单/
			ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(dto.getWorkOrderId());

			@@ -16,11 +16,13 @@
			<result column="validity_period" property="validityPeriod" />
			<result column="filing_certificate_no" property="filingCertificateNo" />
			<result column="uid_no" property="uidNo" />
			<result column="parent_name" property="parentName" />
			</resultMap>
			<select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
			select pm.*,p.product_name
			select pm.*,p.product_name, parent_p.product_name as parent_name
			from product_model pm
			left join product p on pm.product_id = p.id
			left join product parent_p on p.parent_id = parent_p.id
			<where>
			<if test="c.model != null and c.model != ''">
			and pm.model like concat('%',#{c.model},'%')

	src/main/java/com/ruoyi/basic/pojo/ProductModel.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/basic/ProductModelMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -83,4 +83,7 @@
			*/
			@Excel(name = "UID码")
			private String uidNo;

			@TableField(exist = false)
			private String parentName;
			}