~admin/ERP_override.git

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-04-09 9a5d0d77d23c5c7e95623aced4d4cfa2490b895b

refs
用户	guoyuji <guoyujie@ng.com>
	星期二, 四月 9, 2024 08:22 +0800
提交者	guoyuji <guoyujie@ng.com>
	星期二, 四月 9, 2024 08:22 +0800
提交	9a5d0d77d23c5c7e95623aced4d4cfa2490b895b
目录	dd8c37e15305a567e2fdf6080f5723edc0734dc1 目录 \| zip \| gz
parent	169d974febefa4f4bd2f4a863b6a120df04878a8 查看 \| 对比 aed64ecf84f628253c8cc6008e3804f6f2237a5b 查看 \| 对比

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

18个文件已修改

	north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/Replenish/AddReplenish.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialInventory.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/mm/MaterialInventory.xml	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史