~admin/ERP_override.git

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

guoyuji

2024-03-29 d3475019350136c3946afcb3a831a5444e97bc17

refs
用户	guoyuji <guoyujie@ng.com>
	星期五, 三月 29, 2024 09:59 +0800
提交者	guoyuji <guoyujie@ng.com>
	星期五, 三月 29, 2024 09:59 +0800
提交	d3475019350136c3946afcb3a831a5444e97bc17
目录	749044058c194849cceee10f125decd138e3044d 目录 \| zip \| gz
parent	a6342521bb1f06da915635d0441dd8d8e2022f32 查看 \| 对比 200c92c5d4902dad3939527b1f9c0090741c643d 查看 \| 对比

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

14个文件已修改

2个文件已添加

	north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue	81 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue	332 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue	567 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java	43 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/entity/mm/ReturningWarehouse.java	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/entity/mm/ReturningWarehouseDetail.java	31 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java	75 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialStoreMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java	227 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml	312 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/mm/MaterialInventory.xml	312 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/mm/MaterialStore.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史