ERP_override.git

ERP

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

chenlu

2024-04-09 2b5beb898e49fcf859bd99cc3d760a8debf5d15f

refs
用户	chenlu <1320612696@qq.com>
	星期二, 四月 9, 2024 09:12 +0800
提交者	chenlu <1320612696@qq.com>
	星期二, 四月 9, 2024 09:12 +0800
提交	2b5beb898e49fcf859bd99cc3d760a8debf5d15f
目录	996ecc46eac98cfaa1925731e19edc458aae8aee 目录 \| zip \| gz
parent	82afe881f2f323d6ae50a09702c066ed72fee839 查看 \| 对比 47424dbf004a3d4f2fcf6ca4123eb8c86d1ecda7 查看 \| 对比

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

23个文件已修改

	north-glass-erp/northglass-erp/config.js	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	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	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/vite.config.js	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/application.yml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/application.yml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/mm/MaterialInventory.xml	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/PatchLogMapper.xml	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original	对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史