~admin/ERP_override.git

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

guoyuji

2024-04-12 82733ad3ffd8f71315b16e934106f124c4eae356

refs
用户	guoyuji <guoyujie@ng.com>
	星期五, 四月 12, 2024 15:47 +0800
提交者	guoyuji <guoyujie@ng.com>
	星期五, 四月 12, 2024 15:47 +0800
提交	82733ad3ffd8f71315b16e934106f124c4eae356
目录	49ddf8150268995296622bd2551926bb7d71cc56 目录 \| zip \| gz
parent	febc34d3642ad7d1b68be5ac49eea48089b3e2e0 查看 \| 对比 400150d4499e3a27be10c7b5ca1f76b5ab37ccff 查看 \| 对比

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

17个文件已修改

	north-glass-erp/.idea/dataSources.local.xml	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/router/index.js	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/stockReport/StockMonthReport.vue	298 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/stockReport/StockReport.vue	82 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/stockReport/StockWarehouseReport.vue	297 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue	408 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryReport.vue	78 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java	23 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml	145 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml	31 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml	138 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/mm/FinishedOperateLog.xml	145 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/sd/DeliveryDetail.xml	138 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史