ERP_override.git

ERP

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

huang

2024-12-02 911ea91bf388a124e15b6fe4d1884231fe117b07

refs
用户	huang <1532065656@qq.com>
	星期一, 十二月 2, 2024 16:11 +0800
提交者	huang <1532065656@qq.com>
	星期一, 十二月 2, 2024 16:11 +0800
提交	911ea91bf388a124e15b6fe4d1884231fe117b07
目录	fc832c58907ab5bd0eb492b14b4c6ae78cddb142 目录 \| zip \| gz
parent	7a848b7e816cd2309e4ab7c3117b7d155db1af01 查看 \| 对比 e6b3d7f32ca8cff5a809efe6537e46385289a0b9 查看 \| 对比

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

11个文件已修改

	north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue	110 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue	102 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue	26 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorageCreate.vue	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectSurplusMaterials.vue	123 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue	33 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史