~admin/ERP_override.git

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

chenlu

2024-05-28 62fe1fdde69567d7ef3e22192ab6d8488c7a1a92

refs
用户	chenlu <1320612696@qq.com>
	星期二, 五月 28, 2024 15:58 +0800
提交者	chenlu <1320612696@qq.com>
	星期二, 五月 28, 2024 15:58 +0800
提交	62fe1fdde69567d7ef3e22192ab6d8488c7a1a92
目录	1f080bc75bab3530c29280f07a369bbdc351fc48 目录 \| zip \| gz
parent	18b4be9e6b7e8319c2e02b20b9f9b0a422c352a5 查看 \| 对比 591df47bf8cb5518f367a4f7c8c0b94e810ca5c2 查看 \| 对比

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

22个文件已修改

1个文件已添加

	north-glass-erp/northglass-erp/public/importTemplate.xlsx	对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/hook/footSum.js	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/Replenish/AddReplenish.vue	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue	71 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/OrderProductSummaryReport.vue	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue	36 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/tools/DownExcel.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml	38 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史