parent: 7742e8 | 补丁 | 提交对比
chenlu
2024-04-08 eb8fbf0c3736ef329f1844d7eb135a254740268b
refs
用户 chenlu <1320612696@qq.com>
星期一, 四月 8, 2024 11:11 +0800
提交者 chenlu <1320612696@qq.com>
星期一, 四月 8, 2024 11:11 +0800
提交eb8fbf0c3736ef329f1844d7eb135a254740268b
目录 ed348c5043eba388d85fabeb98782350b1fc5a9b 目录 | zip | gz
parent 7742e8433ad6eb4488298384ee42dc9f8940b7d0 查看 | 对比
63a1705be31f5f6a27774743a13740fa7b67b279 查看 | 对比 
Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

# Conflicts:
#	north-glass-erp/target/classes/mapper/pp/Report.xml
2个文件已添加
23个文件已修改
1123 ■■■■■ 已修改文件
north-glass-erp/.idea/dataSources.local.xml 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/BasicTable.vue 145 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue 162 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue 104 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue 173 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java 11 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialOutboundDetail.java 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/pp/OptimizeUse.java 26 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java 29 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java 84 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java 18 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/tools/WebSocketServer.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml 149 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/mm/MaterialInventory.xml 149 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/sd/OrderDetail.xml 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst 15 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst 15 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史