~admin/ERP_override.git

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-05-07 fcd6de629c4f6b8d9e610da854f15ef40115b058

refs
用户	guoyuji <guoyujie@ng.com>
	星期二, 五月 7, 2024 17:03 +0800
提交者	guoyuji <guoyujie@ng.com>
	星期二, 五月 7, 2024 17:03 +0800
提交	fcd6de629c4f6b8d9e610da854f15ef40115b058
目录	95821a224f17d326ed499cd1c19b18028122cbaf 目录 \| zip \| gz
parent	d04cdf7fa560cd86df690e6e5b754e26cdf0e42a 查看 \| 对比 74ed0e73c78c8f6332bbdc29b541437acb07b8f7 查看 \| 对比

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

14个文件已修改

2个文件已添加

	north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/IngredientsStock.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStock.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/Replenish/Replenish.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue	370 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue	267 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/Report.vue	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue	400 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java	27 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/entity/pp/Report.java	60 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java	19 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java	39 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/Report.xml	204 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/Report.xml	204 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml	25 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史